1.1 --- a/tests/test_freebusy_publishing.sh Wed Mar 09 21:38:56 2016 +0100
1.2 +++ b/tests/test_freebusy_publishing.sh Thu Mar 10 01:43:31 2016 +0100
1.3 @@ -4,8 +4,6 @@
1.4
1.5 USER="mailto:paul.boddie@example.com"
1.6 SENDER="mailto:resource-room-confroom@example.com"
1.7 -FBFILE="$STORE/$USER/freebusy"
1.8 -FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER"
1.9
1.10 mkdir -p "$PREFS/$USER"
1.11 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
1.12 @@ -15,17 +13,23 @@
1.13 | "$SHOWMAIL" \
1.14 > out0.tmp
1.15
1.16 - grep -q "^20140401T070000Z${TAB}20140401T080000Z" "$FBOTHERFILE" \
1.17 -&& grep -q "^20140401T080000Z${TAB}20140401T100000Z" "$FBOTHERFILE" \
1.18 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.19 +> out1.tmp
1.20 +
1.21 + grep -q "^20140401T070000Z${TAB}20140401T080000Z" "out1.tmp" \
1.22 +&& grep -q "^20140401T080000Z${TAB}20140401T100000Z" "out1.tmp" \
1.23 && echo "Success" \
1.24 || echo "Failed"
1.25
1.26 "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-publish-again.txt" 2>> $ERROR \
1.27 | "$SHOWMAIL" \
1.28 -> out0.tmp
1.29 +> out2.tmp
1.30
1.31 - grep -q "^20140401T070000Z${TAB}20140401T080000Z" "$FBOTHERFILE" \
1.32 -&& ! grep -q "^20140401T080000Z${TAB}20140401T100000Z" "$FBOTHERFILE" \
1.33 -&& grep -q "^20140401T083000Z${TAB}20140401T100000Z" "$FBOTHERFILE" \
1.34 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.35 +> out3.tmp
1.36 +
1.37 + grep -q "^20140401T070000Z${TAB}20140401T080000Z" "out3.tmp" \
1.38 +&& ! grep -q "^20140401T080000Z${TAB}20140401T100000Z" "out3.tmp" \
1.39 +&& grep -q "^20140401T083000Z${TAB}20140401T100000Z" "out3.tmp" \
1.40 && echo "Success" \
1.41 || echo "Failed"