1.1 --- a/tests/test_person_invitation_add.sh Sat Oct 17 19:49:44 2015 +0200
1.2 +++ b/tests/test_person_invitation_add.sh Sat Oct 17 19:52:09 2015 +0200
1.3 @@ -120,13 +120,14 @@
1.4 || echo "Failed"
1.5
1.6 grep -q "^20141212T090000Z${TAB}20141212T100000Z" "$FBOTHERFILE" \
1.7 -&& grep -q "^20150109T090000Z${TAB}20150109T100000Z" "$FBOTHERFILE" \
1.8 +&& ! grep -q "^20150109T090000Z${TAB}20150109T100000Z" "$FBOTHERFILE" \
1.9 && echo "Success" \
1.10 || echo "Failed"
1.11
1.12 # Present the refresh message to the organiser.
1.13
1.14 "$PERSON_SCRIPT" $ARGS < out5.tmp 2>> $ERROR \
1.15 +| tee out6r.tmp \
1.16 | "$SHOWMAIL" \
1.17 > out6.tmp
1.18
1.19 @@ -136,7 +137,7 @@
1.20
1.21 # Present the request to the recipient.
1.22
1.23 - "$PERSON_SCRIPT" $ARGS < out6.tmp 2>> $ERROR \
1.24 + "$PERSON_SCRIPT" $ARGS < out6r.tmp 2>> $ERROR \
1.25 | "$SHOWMAIL" \
1.26 > out7.tmp
1.27
2.1 --- a/tests/test_person_invitation_counter.sh Sat Oct 17 19:49:44 2015 +0200
2.2 +++ b/tests/test_person_invitation_counter.sh Sat Oct 17 19:52:09 2015 +0200
2.3 @@ -134,8 +134,7 @@
2.4 && echo "Success" \
2.5 || echo "Failed"
2.6
2.7 - grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$SENDER/objects/event6@example.com" \
2.8 -&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T160000' "$STORE/$SENDER/objects/event6@example.com" \
2.9 + grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T160000' "$STORE/$SENDER/objects/event6@example.com" \
2.10 && echo "Success" \
2.11 || echo "Failed"
2.12
3.1 --- a/tests/test_resource_invitation_add.sh Sat Oct 17 19:49:44 2015 +0200
3.2 +++ b/tests/test_resource_invitation_add.sh Sat Oct 17 19:52:09 2015 +0200
3.3 @@ -94,6 +94,7 @@
3.4 # Present the refresh message to the organiser.
3.5
3.6 "$PERSON_SCRIPT" $ARGS < out3.tmp 2>> $ERROR \
3.7 +| tee out4r.tmp \
3.8 | "$SHOWMAIL" \
3.9 > out4.tmp
3.10
3.11 @@ -103,7 +104,7 @@
3.12
3.13 # Present the request to the recipient.
3.14
3.15 - "$RESOURCE_SCRIPT" $ARGS < out4.tmp 2>> $ERROR \
3.16 + "$RESOURCE_SCRIPT" $ARGS < out4r.tmp 2>> $ERROR \
3.17 | tee out5r.tmp \
3.18 | "$SHOWMAIL" \
3.19 > out5.tmp
4.1 --- a/tests/test_resource_invitation_constraints.sh Sat Oct 17 19:49:44 2015 +0200
4.2 +++ b/tests/test_resource_invitation_constraints.sh Sat Oct 17 19:52:09 2015 +0200
4.3 @@ -82,12 +82,12 @@
4.4 | "$SHOWMAIL" \
4.5 > out2.tmp
4.6
4.7 - ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE" \
4.8 + ( ! [ -e "$FBSENDEROTHERFILE" ] \
4.9 + || ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE") \
4.10 && echo "Success" \
4.11 || echo "Failed"
4.12
4.13 - grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$SENDER/objects/event13@example.com" \
4.14 -&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
4.15 + grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
4.16 && echo "Success" \
4.17 || echo "Failed"
4.18
5.1 --- a/tests/test_resource_invitation_constraints_alternative.sh Sat Oct 17 19:49:44 2015 +0200
5.2 +++ b/tests/test_resource_invitation_constraints_alternative.sh Sat Oct 17 19:52:09 2015 +0200
5.3 @@ -87,8 +87,7 @@
5.4 && echo "Success" \
5.5 || echo "Failed"
5.6
5.7 - grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$SENDER/objects/event13@example.com" \
5.8 -&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
5.9 + grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
5.10 && echo "Success" \
5.11 || echo "Failed"
5.12