# HG changeset patch # User Paul Boddie # Date 1441129826 -7200 # Node ID d2b641669fcbb7bb4af2d4d3dab0ad2016122688 # Parent 70fb2f784339a58dfb7736331505b4d29b105083 Added error collection to various script invocations. diff -r 70fb2f784339 -r d2b641669fcb tests/test_person_invitation.sh --- a/tests/test_person_invitation.sh Tue Sep 01 19:43:40 2015 +0200 +++ b/tests/test_person_invitation.sh Tue Sep 01 19:50:26 2015 +0200 @@ -72,9 +72,9 @@ && echo "Success" \ || echo "Failed" - "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event6@example.com" \ + "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event6@example.com" 2>> $ERROR \ | tee out3.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \ && echo "Success" \ @@ -96,9 +96,9 @@ && echo "Success" \ || echo "Failed" - "$DECLINE_SCRIPT" $DECLINE_ARGS "$USER" "event7@example.com" \ + "$DECLINE_SCRIPT" $DECLINE_ARGS "$USER" "event7@example.com" 2>> $ERROR \ | tee out5.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR grep -q "event6@example.com" "$FBFILE" \ && ! grep -q "event7@example.com" "$FBFILE" \ diff -r 70fb2f784339 -r d2b641669fcb tests/test_person_invitation_recurring.sh --- a/tests/test_person_invitation_recurring.sh Tue Sep 01 19:43:40 2015 +0200 +++ b/tests/test_person_invitation_recurring.sh Tue Sep 01 19:50:26 2015 +0200 @@ -72,9 +72,9 @@ && echo "Success" \ || echo "Failed" - "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event8@example.com" \ + "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event8@example.com" 2>> $ERROR \ | tee out3.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR grep -q "^20141212T090000Z${TAB}20141212T100000Z" "$FBFILE" \ && echo "Success" \ @@ -116,9 +116,9 @@ && echo "Success" \ || echo "Failed" - "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event8@example.com" "20141010T080000Z" \ + "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event8@example.com" "20141010T080000Z" 2>> $ERROR \ | tee out6.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR grep -q "^20141011T080000Z${TAB}20141011T090000Z" "$FBFILE" \ && ! grep -q "^20141010T080000Z${TAB}20141010T090000Z" "$FBFILE" \ @@ -161,9 +161,9 @@ && echo "Success" \ || echo "Failed" - "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event8@example.com" \ + "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event8@example.com" 2>> $ERROR \ | tee out8.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR grep -q "^20141212T090000Z${TAB}20141212T100000Z" "$FBFILE" \ && echo "Success" \ @@ -201,9 +201,9 @@ && echo "Success" \ || echo "Failed" - "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event12@example.com" \ + "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event12@example.com" 2>> $ERROR \ | tee out11.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR grep -q "^20141211T220000Z${TAB}20141212T220000Z" "$FBFILE" \ && echo "Success" \ diff -r 70fb2f784339 -r d2b641669fcb tests/test_person_non_participation.sh --- a/tests/test_person_non_participation.sh Tue Sep 01 19:43:40 2015 +0200 +++ b/tests/test_person_non_participation.sh Tue Sep 01 19:50:26 2015 +0200 @@ -61,9 +61,9 @@ && echo "Success" \ || echo "Failed" - "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" < "$TEMPLATES/event-request-person-object.txt" \ + "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" < "$TEMPLATES/event-request-person-object.txt" 2>> $ERROR \ | tee out3.tmp \ -| "$OUTGOING_SCRIPT" $ARGS +| "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR ! [ -e "$FBFILE" ] \ || ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \