1.1 --- a/tests/test_resource_invitation.sh Tue Jul 28 00:14:57 2015 +0200
1.2 +++ b/tests/test_resource_invitation.sh Tue Jul 28 19:27:27 2015 +0200
1.3 @@ -60,13 +60,22 @@
1.4 && echo "Success" \
1.5 || echo "Failed"
1.6
1.7 - "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
1.8 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict-utc.txt" 2>> $ERROR \
1.9 | "$SHOWMAIL" \
1.10 > out5.tmp
1.11
1.12 grep -q 'METHOD:REPLY' out5.tmp \
1.13 -&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T150000Z/20141126T160000Z' out5.tmp \
1.14 -&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out5.tmp | wc -l` = '1' ] \
1.15 +&& grep -q 'ATTENDEE;PARTSTAT=DECLINED' out5.tmp \
1.16 +&& echo "Success" \
1.17 +|| echo "Failed"
1.18 +
1.19 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
1.20 +| "$SHOWMAIL" \
1.21 +> out6.tmp
1.22 +
1.23 + grep -q 'METHOD:REPLY' out6.tmp \
1.24 +&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T150000Z/20141126T160000Z' out6.tmp \
1.25 +&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out6.tmp | wc -l` = '1' ] \
1.26 && echo "Success" \
1.27 || echo "Failed"
1.28
1.29 @@ -75,10 +84,10 @@
1.30
1.31 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2>> $ERROR \
1.32 | "$SHOWMAIL" \
1.33 -> out6.tmp
1.34 +> out7.tmp
1.35
1.36 - grep -q 'METHOD:REPLY' out6.tmp \
1.37 -&& ! grep -q '^FREEBUSY' out6.tmp \
1.38 + grep -q 'METHOD:REPLY' out7.tmp \
1.39 +&& ! grep -q '^FREEBUSY' out7.tmp \
1.40 && echo "Success" \
1.41 || echo "Failed"
1.42
1.43 @@ -87,9 +96,9 @@
1.44
1.45 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2>> $ERROR \
1.46 | "$SHOWMAIL" \
1.47 -> out7.tmp
1.48 +> out8.tmp
1.49
1.50 - grep -q 'METHOD:REPLY' out7.tmp \
1.51 -&& ! grep -q '^FREEBUSY' out7.tmp \
1.52 + grep -q 'METHOD:REPLY' out8.tmp \
1.53 +&& ! grep -q '^FREEBUSY' out8.tmp \
1.54 && echo "Success" \
1.55 || echo "Failed"