imip-agent

Changeset

602:eca4f3d4ee64
2015-07-26 Paul Boddie raw files shortlog changelog graph Added error output collection, tidying of error and output files.
tests/test_multiple_invitation.sh (file) tests/test_outgoing_invitation.sh (file) tests/test_person_invitation.sh (file) tests/test_person_invitation_recurring.sh (file) tests/test_resource_invitation.sh (file) tests/test_resource_invitation_recurring.sh (file) tests/test_resource_invitation_recurring_day.sh (file)
     1.1 --- a/tests/test_multiple_invitation.sh	Sat Jul 25 23:18:58 2015 +0200
     1.2 +++ b/tests/test_multiple_invitation.sh	Sun Jul 26 01:47:29 2015 +0200
     1.3 @@ -8,11 +8,14 @@
     1.4  STORE=/tmp/store
     1.5  STATIC=/tmp/static
     1.6  ARGS="-S $STORE -P $STATIC -d"
     1.7 +ERROR=err.tmp
     1.8  
     1.9  rm -r $STORE
    1.10  rm -r $STATIC
    1.11 +rm $ERROR
    1.12 +rm out*.tmp
    1.13  
    1.14 -  "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
    1.15 +  "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request-all.txt 2>> $ERROR \
    1.16  | "$SHOWMAIL" \
    1.17  > out0.tmp
    1.18  
    1.19 @@ -21,7 +24,7 @@
    1.20  && echo "Success" \
    1.21  || echo "Failed"
    1.22  
    1.23 -  "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
    1.24 +  "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request.txt 2>> $ERROR \
    1.25  | "$SHOWMAIL" \
    1.26  > out1.tmp
    1.27  
    1.28 @@ -30,7 +33,7 @@
    1.29  && echo "Success" \
    1.30  || echo "Failed"
    1.31  
    1.32 -  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/event-request-multiple.txt" 2> /dev/null \
    1.33 +  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/event-request-multiple.txt" 2>> $ERROR \
    1.34  | "$SHOWMAIL" \
    1.35  > out2.tmp
    1.36  
    1.37 @@ -39,7 +42,7 @@
    1.38  && echo "Success" \
    1.39  || echo "Failed"
    1.40  
    1.41 -  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/event-request-multiple.txt" 2> /dev/null \
    1.42 +  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/event-request-multiple.txt" 2>> $ERROR \
    1.43  | "$SHOWMAIL" \
    1.44  > out3.tmp
    1.45  
    1.46 @@ -48,7 +51,7 @@
    1.47  && echo "Success" \
    1.48  || echo "Failed"
    1.49  
    1.50 -  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2> /dev/null \
    1.51 +  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
    1.52  | "$SHOWMAIL" \
    1.53  > out4.tmp
    1.54  
    1.55 @@ -57,7 +60,7 @@
    1.56  && echo "Success" \
    1.57  || echo "Failed"
    1.58  
    1.59 -  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2> /dev/null \
    1.60 +  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \
    1.61  | "$SHOWMAIL" \
    1.62  > out5.tmp
    1.63  
    1.64 @@ -66,10 +69,10 @@
    1.65  && echo "Success" \
    1.66  || echo "Failed"
    1.67  
    1.68 -"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-multiple-attendee.txt" 2> /dev/null
    1.69 +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-multiple-attendee.txt" 2>> $ERROR
    1.70  echo "Cancel..."
    1.71  
    1.72 -  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2> /dev/null \
    1.73 +  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
    1.74  | "$SHOWMAIL" \
    1.75  > out6.tmp
    1.76  
    1.77 @@ -78,7 +81,7 @@
    1.78  && echo "Success" \
    1.79  || echo "Failed"
    1.80  
    1.81 -  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2> /dev/null \
    1.82 +  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \
    1.83  | "$SHOWMAIL" \
    1.84  > out7.tmp
    1.85  
     2.1 --- a/tests/test_outgoing_invitation.sh	Sat Jul 25 23:18:58 2015 +0200
     2.2 +++ b/tests/test_outgoing_invitation.sh	Sun Jul 26 01:47:29 2015 +0200
     2.3 @@ -11,18 +11,21 @@
     2.4  USER="mailto:paul.boddie@example.com"
     2.5  FBFILE="$STORE/$USER/freebusy"
     2.6  TAB=`printf '\t'`
     2.7 +ERROR=err.tmp
     2.8  
     2.9  rm -r $STORE
    2.10  rm -r $STATIC
    2.11 +rm $ERROR
    2.12 +rm out*.tmp
    2.13  
    2.14 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null
    2.15 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2>> $ERROR
    2.16  cp "$FBFILE" out1.tmp
    2.17  
    2.18     grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
    2.19  && echo "Success" \
    2.20  || echo "Failed"
    2.21  
    2.22 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null
    2.23 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2>> $ERROR
    2.24  echo "Cancel..."
    2.25  cp "$FBFILE" out2.tmp
    2.26  
    2.27 @@ -30,7 +33,7 @@
    2.28  && echo "Success" \
    2.29  || echo "Failed"
    2.30  
    2.31 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2> /dev/null
    2.32 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2>> $ERROR
    2.33  cp "$FBFILE" out3.tmp
    2.34  
    2.35     [ `cat "$FBFILE" | wc -l` = '3' ] \
    2.36 @@ -38,7 +41,7 @@
    2.37  && echo "Success" \
    2.38  || echo "Failed"
    2.39  
    2.40 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2> /dev/null
    2.41 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2>> $ERROR
    2.42  cp "$FBFILE" out4.tmp
    2.43  
    2.44     [ `cat "$FBFILE" | wc -l` = '2' ] \
    2.45 @@ -46,7 +49,7 @@
    2.46  && echo "Success" \
    2.47  || echo "Failed"
    2.48  
    2.49 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2> /dev/null
    2.50 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2>> $ERROR
    2.51  cp "$FBFILE" out5.tmp
    2.52  
    2.53     grep -q "^20141011T080000Z${TAB}20141011T090000Z" "$FBFILE" \
    2.54 @@ -54,14 +57,14 @@
    2.55  && echo "Success" \
    2.56  || echo "Failed"
    2.57  
    2.58 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2> /dev/null
    2.59 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2>> $ERROR
    2.60  cp "$FBFILE" out6.tmp
    2.61  
    2.62     ! grep -q '^2' "$FBFILE" \
    2.63  && echo "Success" \
    2.64  || echo "Failed"
    2.65  
    2.66 -"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2> /dev/null
    2.67 +"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2>> $ERROR
    2.68  cp "$FBFILE" out7.tmp
    2.69  
    2.70     [ `cat "$FBFILE" | wc -l` = '3' ] \
     3.1 --- a/tests/test_person_invitation.sh	Sat Jul 25 23:18:58 2015 +0200
     3.2 +++ b/tests/test_person_invitation.sh	Sun Jul 26 01:47:29 2015 +0200
     3.3 @@ -25,10 +25,14 @@
     3.4  DECLINE_SCRIPT="$THIS_DIR/test_handle.py"
     3.5  DECLINE_ARGS="decline $STORE"
     3.6  
     3.7 +ERROR=err.tmp
     3.8 +
     3.9  rm -r $STORE
    3.10  rm -r $STATIC
    3.11 +rm $ERROR
    3.12 +rm out*.tmp
    3.13  
    3.14 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2> /dev/null \
    3.15 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2>> $ERROR \
    3.16  | "$SHOWMAIL" \
    3.17  > out0.tmp
    3.18  
    3.19 @@ -37,7 +41,7 @@
    3.20  && echo "Success" \
    3.21  || echo "Failed"
    3.22  
    3.23 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2> /dev/null \
    3.24 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2>> $ERROR \
    3.25  | "$SHOWMAIL" \
    3.26  > out1.tmp
    3.27  
    3.28 @@ -46,7 +50,7 @@
    3.29  && echo "Success" \
    3.30  || echo "Failed"
    3.31  
    3.32 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person.txt" 2> /dev/null \
    3.33 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person.txt" 2>> $ERROR \
    3.34  | "$SHOWMAIL" \
    3.35  > out2.tmp
    3.36  
    3.37 @@ -70,7 +74,7 @@
    3.38  && echo "Success" \
    3.39  || echo "Failed"
    3.40  
    3.41 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-conflict.txt" 2> /dev/null \
    3.42 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-conflict.txt" 2>> $ERROR \
    3.43  | "$SHOWMAIL" \
    3.44  > out4.tmp
    3.45  
    3.46 @@ -95,7 +99,7 @@
    3.47  && echo "Success" \
    3.48  || echo "Failed"
    3.49  
    3.50 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person.txt" 2> /dev/null \
    3.51 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person.txt" 2>> $ERROR \
    3.52  | "$SHOWMAIL" \
    3.53  > out6.tmp
    3.54  
    3.55 @@ -111,7 +115,7 @@
    3.56  && echo "Success" \
    3.57  || echo "Failed"
    3.58  
    3.59 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-all.txt" 2> /dev/null \
    3.60 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-all.txt" 2>> $ERROR \
    3.61  | "$SHOWMAIL" \
    3.62  > out7.tmp
    3.63  
    3.64 @@ -127,7 +131,7 @@
    3.65  && echo "Success" \
    3.66  || echo "Failed"
    3.67  
    3.68 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-spoofed.txt" 2> /dev/null \
    3.69 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-spoofed.txt" 2>> $ERROR \
    3.70  | "$SHOWMAIL" \
    3.71  > out8.tmp
    3.72  
     4.1 --- a/tests/test_person_invitation_recurring.sh	Sat Jul 25 23:18:58 2015 +0200
     4.2 +++ b/tests/test_person_invitation_recurring.sh	Sun Jul 26 01:47:29 2015 +0200
     4.3 @@ -25,10 +25,14 @@
     4.4  DECLINE_SCRIPT="$THIS_DIR/test_handle.py"
     4.5  DECLINE_ARGS="decline $STORE"
     4.6  
     4.7 +ERROR=err.tmp
     4.8 +
     4.9  rm -r $STORE
    4.10  rm -r $STATIC
    4.11 +rm $ERROR
    4.12 +rm out*.tmp
    4.13  
    4.14 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2> /dev/null \
    4.15 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2>> $ERROR \
    4.16  | "$SHOWMAIL" \
    4.17  > out0.tmp
    4.18  
    4.19 @@ -37,7 +41,7 @@
    4.20  && echo "Success" \
    4.21  || echo "Failed"
    4.22  
    4.23 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2> /dev/null \
    4.24 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2>> $ERROR \
    4.25  | "$SHOWMAIL" \
    4.26  > out1.tmp
    4.27  
    4.28 @@ -46,7 +50,7 @@
    4.29  && echo "Success" \
    4.30  || echo "Failed"
    4.31  
    4.32 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring.txt" 2> /dev/null \
    4.33 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring.txt" 2>> $ERROR \
    4.34  | "$SHOWMAIL" \
    4.35  > out2.tmp
    4.36  
    4.37 @@ -70,7 +74,7 @@
    4.38  && echo "Success" \
    4.39  || echo "Failed"
    4.40  
    4.41 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring-instance.txt" 2> /dev/null \
    4.42 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring-instance.txt" 2>> $ERROR \
    4.43  | "$SHOWMAIL" \
    4.44  > out4.tmp
    4.45  
    4.46 @@ -88,7 +92,7 @@
    4.47  && echo "Success" \
    4.48  || echo "Failed"
    4.49  
    4.50 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring-reschedule-instance.txt" 2> /dev/null \
    4.51 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person-recurring-reschedule-instance.txt" 2>> $ERROR \
    4.52  | "$SHOWMAIL" \
    4.53  > out5.tmp
    4.54  
    4.55 @@ -115,7 +119,7 @@
    4.56  && echo "Success" \
    4.57  || echo "Failed"
    4.58  
    4.59 -  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring.txt" 2> /dev/null \
    4.60 +  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-person-recurring.txt" 2>> $ERROR \
    4.61  | "$SHOWMAIL" \
    4.62  > out6.tmp
    4.63  
     5.1 --- a/tests/test_resource_invitation.sh	Sat Jul 25 23:18:58 2015 +0200
     5.2 +++ b/tests/test_resource_invitation.sh	Sun Jul 26 01:47:29 2015 +0200
     5.3 @@ -8,11 +8,14 @@
     5.4  STORE=/tmp/store
     5.5  STATIC=/tmp/static
     5.6  ARGS="-S $STORE -P $STATIC -d"
     5.7 +ERROR=err.tmp
     5.8  
     5.9  rm -r $STORE
    5.10  rm -r $STATIC
    5.11 +rm $ERROR
    5.12 +rm out*.tmp
    5.13  
    5.14 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    5.15 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    5.16  | "$SHOWMAIL" \
    5.17  > out0.tmp
    5.18  
    5.19 @@ -21,7 +24,7 @@
    5.20  && echo "Success" \
    5.21  || echo "Failed"
    5.22  
    5.23 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
    5.24 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
    5.25  | "$SHOWMAIL" \
    5.26  > out1.tmp
    5.27  
    5.28 @@ -30,7 +33,7 @@
    5.29  && echo "Success" \
    5.30  || echo "Failed"
    5.31  
    5.32 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null \
    5.33 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2>> $ERROR \
    5.34  | "$SHOWMAIL" \
    5.35  > out2.tmp
    5.36  
    5.37 @@ -39,7 +42,7 @@
    5.38  && echo "Success" \
    5.39  || echo "Failed"
    5.40  
    5.41 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
    5.42 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
    5.43  | "$SHOWMAIL" \
    5.44  > out3.tmp
    5.45  
    5.46 @@ -48,7 +51,7 @@
    5.47  && echo "Success" \
    5.48  || echo "Failed"
    5.49  
    5.50 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict.txt" 2> /dev/null \
    5.51 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict.txt" 2>> $ERROR \
    5.52  | "$SHOWMAIL" \
    5.53  > out4.tmp
    5.54  
    5.55 @@ -57,7 +60,7 @@
    5.56  && echo "Success" \
    5.57  || echo "Failed"
    5.58  
    5.59 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
    5.60 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
    5.61  | "$SHOWMAIL" \
    5.62  > out5.tmp
    5.63  
    5.64 @@ -67,10 +70,10 @@
    5.65  && echo "Success" \
    5.66  || echo "Failed"
    5.67  
    5.68 -"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null
    5.69 +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2>> $ERROR
    5.70  echo "Cancel..."
    5.71  
    5.72 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
    5.73 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
    5.74  | "$SHOWMAIL" \
    5.75  > out6.tmp
    5.76  
    5.77 @@ -79,10 +82,10 @@
    5.78  && echo "Success" \
    5.79  || echo "Failed"
    5.80  
    5.81 -"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-spoofed.txt" 2> /dev/null
    5.82 +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-spoofed.txt" 2>> $ERROR
    5.83  echo "Spoof..."
    5.84  
    5.85 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    5.86 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    5.87  | "$SHOWMAIL" \
    5.88  > out7.tmp
    5.89  
     6.1 --- a/tests/test_resource_invitation_recurring.sh	Sat Jul 25 23:18:58 2015 +0200
     6.2 +++ b/tests/test_resource_invitation_recurring.sh	Sun Jul 26 01:47:29 2015 +0200
     6.3 @@ -8,11 +8,14 @@
     6.4  STORE=/tmp/store
     6.5  STATIC=/tmp/static
     6.6  ARGS="-S $STORE -P $STATIC -d"
     6.7 +ERROR=err.tmp
     6.8  
     6.9  rm -r $STORE
    6.10  rm -r $STATIC
    6.11 +rm $ERROR
    6.12 +rm out*.tmp
    6.13  
    6.14 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    6.15 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    6.16  | "$SHOWMAIL" \
    6.17  > out0.tmp
    6.18  
    6.19 @@ -21,7 +24,7 @@
    6.20  && echo "Success" \
    6.21  || echo "Failed"
    6.22  
    6.23 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2> /dev/null \
    6.24 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2>> $ERROR \
    6.25  | "$SHOWMAIL" \
    6.26  > out2.tmp
    6.27  
    6.28 @@ -30,7 +33,7 @@
    6.29  && echo "Success" \
    6.30  || echo "Failed"
    6.31  
    6.32 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    6.33 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    6.34  | "$SHOWMAIL" \
    6.35  > out3.tmp
    6.36  
    6.37 @@ -40,10 +43,10 @@
    6.38  && echo "Success" \
    6.39  || echo "Failed"
    6.40  
    6.41 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2> /dev/null
    6.42 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2>> $ERROR
    6.43  echo "Cancel..."
    6.44  
    6.45 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    6.46 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    6.47  | "$SHOWMAIL" \
    6.48  > out4.tmp
    6.49  
    6.50 @@ -53,7 +56,7 @@
    6.51  && echo "Success" \
    6.52  || echo "Failed"
    6.53  
    6.54 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2> /dev/null \
    6.55 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2>> $ERROR \
    6.56  | "$SHOWMAIL" \
    6.57  > out5.tmp
    6.58  
    6.59 @@ -62,7 +65,7 @@
    6.60  && echo "Success" \
    6.61  || echo "Failed"
    6.62  
    6.63 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    6.64 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    6.65  | "$SHOWMAIL" \
    6.66  > out6.tmp
    6.67  
    6.68 @@ -72,10 +75,10 @@
    6.69  && echo "Success" \
    6.70  || echo "Failed"
    6.71  
    6.72 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2> /dev/null
    6.73 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2>> $ERROR
    6.74  echo "Cancel..."
    6.75  
    6.76 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    6.77 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    6.78  | "$SHOWMAIL" \
    6.79  > out7.tmp
    6.80  
     7.1 --- a/tests/test_resource_invitation_recurring_day.sh	Sat Jul 25 23:18:58 2015 +0200
     7.2 +++ b/tests/test_resource_invitation_recurring_day.sh	Sun Jul 26 01:47:29 2015 +0200
     7.3 @@ -9,10 +9,14 @@
     7.4  STATIC=/tmp/static
     7.5  ARGS="-S $STORE -P $STATIC -d"
     7.6  
     7.7 +ERROR=err.tmp
     7.8 +
     7.9  rm -r $STORE
    7.10  rm -r $STATIC
    7.11 +rm $ERROR
    7.12 +rm out*.tmp
    7.13  
    7.14 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    7.15 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    7.16  | "$SHOWMAIL" \
    7.17  > out0.tmp
    7.18  
    7.19 @@ -21,7 +25,7 @@
    7.20  && echo "Success" \
    7.21  || echo "Failed"
    7.22  
    7.23 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2> /dev/null \
    7.24 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2>> $ERROR \
    7.25  | "$SHOWMAIL" \
    7.26  > out1.tmp
    7.27  
    7.28 @@ -30,7 +34,7 @@
    7.29  && echo "Success" \
    7.30  || echo "Failed"
    7.31  
    7.32 -  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
    7.33 +  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
    7.34  | "$SHOWMAIL" \
    7.35  > out2.tmp
    7.36