From: <dfa...@us...> - 2010-09-18 21:15:35
|
Revision: 13320 http://gphoto.svn.sourceforge.net/gphoto/?rev=13320&view=rev Author: dfandrich Date: 2010-09-18 21:15:26 +0000 (Sat, 18 Sep 2010) Log Message: ----------- Added new test cases Modified Paths: -------------- trunk/gphoto2/tests/data/test029.param trunk/gphoto2/tests/data/test030.param Added Paths: ----------- trunk/gphoto2/tests/data/test031.param trunk/gphoto2/tests/data/test031.result trunk/gphoto2/tests/data/test032.param trunk/gphoto2/tests/data/test032.result trunk/gphoto2/tests/data/test033.param trunk/gphoto2/tests/data/test033.result trunk/gphoto2/tests/data/test034.param trunk/gphoto2/tests/data/test034.result Modified: trunk/gphoto2/tests/data/test029.param =================================================================== --- trunk/gphoto2/tests/data/test029.param 2010-09-18 06:30:18 UTC (rev 13319) +++ trunk/gphoto2/tests/data/test029.param 2010-09-18 21:15:26 UTC (rev 13320) @@ -1,4 +1,3 @@ TITLE='Invalid camera' -COMMAND='$PROGRAM --camera="Xyzzy Foo camera" --abilities 2> "$ERRFILE" > "$OUTFILE"' +COMMAND='$PROGRAM --camera="Xyzzy Foo camera" --abilities 2> "$OUTFILE" > /dev/null' RESULTCODE=1 -POSTCOMMAND='cp "$ERRFILE" "$OUTFILE"' Modified: trunk/gphoto2/tests/data/test030.param =================================================================== --- trunk/gphoto2/tests/data/test030.param 2010-09-18 06:30:18 UTC (rev 13319) +++ trunk/gphoto2/tests/data/test030.param 2010-09-18 21:15:26 UTC (rev 13320) @@ -1,4 +1,3 @@ TITLE='Invalid port type' -COMMAND='$PROGRAM --camera="Directory Browse" --port=badport:bad --abilities 2> "$ERRFILE" > "$OUTFILE"' +COMMAND='$PROGRAM --camera="Directory Browse" --port=badport:bad --abilities 2> "$OUTFILE" > /dev/null' RESULTCODE=1 -POSTCOMMAND='cp "$ERRFILE" "$OUTFILE"' Added: trunk/gphoto2/tests/data/test031.param =================================================================== --- trunk/gphoto2/tests/data/test031.param (rev 0) +++ trunk/gphoto2/tests/data/test031.param 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,3 @@ +TITLE='Get storage info' +COMMAND='$PROGRAM --camera="Directory Browse" --port=disk:"$STAGINGDIR" --storage-info 2> "$ERRFILE" > "$OUTFILE"' +SEDCOMMAND='s@\(totalcapacity=\|free=\).*$@\1@' Property changes on: trunk/gphoto2/tests/data/test031.param ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test031.result =================================================================== --- trunk/gphoto2/tests/data/test031.result (rev 0) +++ trunk/gphoto2/tests/data/test031.result 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,8 @@ +[Storage 0] +description=Directory Driver +basedir=/ +access=0 Read-Write +type=4 Removable RAM +fstype=4 Generic Hierarchical +totalcapacity= +free= Property changes on: trunk/gphoto2/tests/data/test031.result ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test032.param =================================================================== --- trunk/gphoto2/tests/data/test032.param (rev 0) +++ trunk/gphoto2/tests/data/test032.param 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,4 @@ +TITLE='Hook script on download' +COMMAND='$PROGRAM --camera="Directory Browse" --port=disk:"$STAGINGDIR" --hook-script=/usr/bin/env --get-file=1 2> "$ERRFILE" > "$OUTFILE"' +SEDCOMMAND='/^ACTION=\|^ARGUMENT=\|^Saving/!d' +POSTCOMMAND='rm gphotobutton.jpg' Property changes on: trunk/gphoto2/tests/data/test032.param ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test032.result =================================================================== --- trunk/gphoto2/tests/data/test032.result (rev 0) +++ trunk/gphoto2/tests/data/test032.result 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,6 @@ +ACTION=init +ACTION=start +Saving file as gphotobutton.jpg +ACTION=download +ARGUMENT=gphotobutton.jpg +ACTION=stop Property changes on: trunk/gphoto2/tests/data/test032.result ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test033.param =================================================================== --- trunk/gphoto2/tests/data/test033.param (rev 0) +++ trunk/gphoto2/tests/data/test033.param 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,5 @@ +TITLE='Hook script on upload' +PRECOMMAND='mkdir "$LOGDIR/uploaddir"' +COMMAND='$PROGRAM --camera="Directory Browse" --port=disk:"$LOGDIR" --hook-script=/usr/bin/env -f /uploaddir --upload-file="$STAGINGDIR/subdir1/architecture.png" 2> "$ERRFILE" > "$OUTFILE"' +SEDCOMMAND='/^ACTION=\|^ARGUMENT=\|^Saving/!d' +POSTCOMMAND='rm "$LOGDIR/uploaddir/architecture.png" && rmdir "$LOGDIR/uploaddir"' Property changes on: trunk/gphoto2/tests/data/test033.param ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test033.result =================================================================== --- trunk/gphoto2/tests/data/test033.result (rev 0) +++ trunk/gphoto2/tests/data/test033.result 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,3 @@ +ACTION=init +ACTION=start +ACTION=stop Property changes on: trunk/gphoto2/tests/data/test033.result ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test034.param =================================================================== --- trunk/gphoto2/tests/data/test034.param (rev 0) +++ trunk/gphoto2/tests/data/test034.param 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,3 @@ +TITLE='Show image info' +COMMAND='$PROGRAM --camera="Directory Browse" --port=disk:"$STAGINGDIR" --show-info=4 2> "$ERRFILE" > "$OUTFILE"' +SEDCOMMAND='s@^\( *Time:\).*$@\1@' Property changes on: trunk/gphoto2/tests/data/test034.param ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/gphoto2/tests/data/test034.result =================================================================== --- trunk/gphoto2/tests/data/test034.result (rev 0) +++ trunk/gphoto2/tests/data/test034.result 2010-09-18 21:15:26 UTC (rev 13320) @@ -0,0 +1,10 @@ +Information on file 'architecture.png' (folder '/subdir1'): +File: + Mime type: 'image/png' + Size: 4789 byte(s) + Permissions: read/delete + Time: +Thumbnail: + None available. +Audio data: + None available. Property changes on: trunk/gphoto2/tests/data/test034.result ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |