# HG changeset patch # User Paul Boddie # Date 1437868049 -7200 # Node ID eca4f3d4ee648e07b3d9c51871147706045655cf # Parent f6cad1ec5673c8cd74ebcc75abc94c6f5286a402 Added error output collection, tidying of error and output files. diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_multiple_invitation.sh --- a/tests/test_multiple_invitation.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_multiple_invitation.sh Sun Jul 26 01:47:29 2015 +0200 @@ -8,11 +8,14 @@ STORE=/tmp/store STATIC=/tmp/static ARGS="-S $STORE -P $STATIC -d" +ERROR=err.tmp rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp - "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request-all.txt 2>> $ERROR \ | "$SHOWMAIL" \ > out0.tmp @@ -21,7 +24,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request.txt 2>> $ERROR \ | "$SHOWMAIL" \ > out1.tmp @@ -30,7 +33,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/event-request-multiple.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/event-request-multiple.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out2.tmp @@ -39,7 +42,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/event-request-multiple.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/event-request-multiple.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out3.tmp @@ -48,7 +51,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out4.tmp @@ -57,7 +60,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out5.tmp @@ -66,10 +69,10 @@ && echo "Success" \ || echo "Failed" -"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-multiple-attendee.txt" 2> /dev/null +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-multiple-attendee.txt" 2>> $ERROR echo "Cancel..." - "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out6.tmp @@ -78,7 +81,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out7.tmp diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_outgoing_invitation.sh --- a/tests/test_outgoing_invitation.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_outgoing_invitation.sh Sun Jul 26 01:47:29 2015 +0200 @@ -11,18 +11,21 @@ USER="mailto:paul.boddie@example.com" FBFILE="$STORE/$USER/freebusy" TAB=`printf '\t'` +ERROR=err.tmp rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2>> $ERROR cp "$FBFILE" out1.tmp grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \ && echo "Success" \ || echo "Failed" -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2>> $ERROR echo "Cancel..." cp "$FBFILE" out2.tmp @@ -30,7 +33,7 @@ && echo "Success" \ || echo "Failed" -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2>> $ERROR cp "$FBFILE" out3.tmp [ `cat "$FBFILE" | wc -l` = '3' ] \ @@ -38,7 +41,7 @@ && echo "Success" \ || echo "Failed" -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2>> $ERROR cp "$FBFILE" out4.tmp [ `cat "$FBFILE" | wc -l` = '2' ] \ @@ -46,7 +49,7 @@ && echo "Success" \ || echo "Failed" -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2>> $ERROR cp "$FBFILE" out5.tmp grep -q "^20141011T080000Z${TAB}20141011T090000Z" "$FBFILE" \ @@ -54,14 +57,14 @@ && echo "Success" \ || echo "Failed" -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2>> $ERROR cp "$FBFILE" out6.tmp ! grep -q '^2' "$FBFILE" \ && echo "Success" \ || echo "Failed" -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2> /dev/null +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2>> $ERROR cp "$FBFILE" out7.tmp [ `cat "$FBFILE" | wc -l` = '3' ] \ diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_person_invitation.sh --- a/tests/test_person_invitation.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_person_invitation.sh Sun Jul 26 01:47:29 2015 +0200 @@ -25,10 +25,14 @@ DECLINE_SCRIPT="$THIS_DIR/test_handle.py" DECLINE_ARGS="decline $STORE" +ERROR=err.tmp + rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out0.tmp @@ -37,7 +41,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out1.tmp @@ -46,7 +50,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out2.tmp @@ -70,7 +74,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-conflict.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-conflict.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out4.tmp @@ -95,7 +99,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out6.tmp @@ -111,7 +115,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-all.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out7.tmp @@ -127,7 +131,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-spoofed.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-spoofed.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out8.tmp diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_person_invitation_recurring.sh --- a/tests/test_person_invitation_recurring.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_person_invitation_recurring.sh Sun Jul 26 01:47:29 2015 +0200 @@ -25,10 +25,14 @@ DECLINE_SCRIPT="$THIS_DIR/test_handle.py" DECLINE_ARGS="decline $STORE" +ERROR=err.tmp + rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out0.tmp @@ -37,7 +41,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out1.tmp @@ -46,7 +50,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out2.tmp @@ -70,7 +74,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring-instance.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring-instance.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out4.tmp @@ -88,7 +92,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring-reschedule-instance.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring-reschedule-instance.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out5.tmp @@ -115,7 +119,7 @@ && echo "Success" \ || echo "Failed" - "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring.txt" 2> /dev/null \ + "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out6.tmp diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_resource_invitation.sh --- a/tests/test_resource_invitation.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_resource_invitation.sh Sun Jul 26 01:47:29 2015 +0200 @@ -8,11 +8,14 @@ STORE=/tmp/store STATIC=/tmp/static ARGS="-S $STORE -P $STATIC -d" +ERROR=err.tmp rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out0.tmp @@ -21,7 +24,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out1.tmp @@ -30,7 +33,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out2.tmp @@ -39,7 +42,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out3.tmp @@ -48,7 +51,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out4.tmp @@ -57,7 +60,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out5.tmp @@ -67,10 +70,10 @@ && echo "Success" \ || echo "Failed" -"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2>> $ERROR echo "Cancel..." - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out6.tmp @@ -79,10 +82,10 @@ && echo "Success" \ || echo "Failed" -"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-spoofed.txt" 2> /dev/null +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-spoofed.txt" 2>> $ERROR echo "Spoof..." - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out7.tmp diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_resource_invitation_recurring.sh --- a/tests/test_resource_invitation_recurring.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_resource_invitation_recurring.sh Sun Jul 26 01:47:29 2015 +0200 @@ -8,11 +8,14 @@ STORE=/tmp/store STATIC=/tmp/static ARGS="-S $STORE -P $STATIC -d" +ERROR=err.tmp rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out0.tmp @@ -21,7 +24,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out2.tmp @@ -30,7 +33,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out3.tmp @@ -40,10 +43,10 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2> /dev/null + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2>> $ERROR echo "Cancel..." - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out4.tmp @@ -53,7 +56,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out5.tmp @@ -62,7 +65,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out6.tmp @@ -72,10 +75,10 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2> /dev/null + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2>> $ERROR echo "Cancel..." - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out7.tmp diff -r f6cad1ec5673 -r eca4f3d4ee64 tests/test_resource_invitation_recurring_day.sh --- a/tests/test_resource_invitation_recurring_day.sh Sat Jul 25 23:18:58 2015 +0200 +++ b/tests/test_resource_invitation_recurring_day.sh Sun Jul 26 01:47:29 2015 +0200 @@ -9,10 +9,14 @@ STATIC=/tmp/static ARGS="-S $STORE -P $STATIC -d" +ERROR=err.tmp + rm -r $STORE rm -r $STATIC +rm $ERROR +rm out*.tmp - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out0.tmp @@ -21,7 +25,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out1.tmp @@ -30,7 +34,7 @@ && echo "Success" \ || echo "Failed" - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \ + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \ | "$SHOWMAIL" \ > out2.tmp