# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1445104329 -7200
# Node ID 295bb865bfe904affe4affb64310d224a1252973
# Parent  f8275d357b555f31a8d2e6750f0b0fec205ad5a2
Removed participation status expectations upon receiving counter-proposals.
Removed updates of organiser free/busy details when receiving ADD messages that
are handled by sending a REFRESH message in response.
Fixed usage of command output by employing the "raw" version, not the version
processed by the showmail.py script.

diff -r f8275d357b55 -r 295bb865bfe9 tests/test_person_invitation_add.sh
--- a/tests/test_person_invitation_add.sh	Sat Oct 17 19:49:44 2015 +0200
+++ b/tests/test_person_invitation_add.sh	Sat Oct 17 19:52:09 2015 +0200
@@ -120,13 +120,14 @@
 || echo "Failed"
 
    grep -q "^20141212T090000Z${TAB}20141212T100000Z" "$FBOTHERFILE" \
-&& grep -q "^20150109T090000Z${TAB}20150109T100000Z" "$FBOTHERFILE" \
+&& ! grep -q "^20150109T090000Z${TAB}20150109T100000Z" "$FBOTHERFILE" \
 && echo "Success" \
 || echo "Failed"
 
 # Present the refresh message to the organiser.
 
   "$PERSON_SCRIPT" $ARGS < out5.tmp 2>> $ERROR \
+| tee out6r.tmp \
 | "$SHOWMAIL" \
 > out6.tmp
 
@@ -136,7 +137,7 @@
 
 # Present the request to the recipient.
 
-  "$PERSON_SCRIPT" $ARGS < out6.tmp 2>> $ERROR \
+  "$PERSON_SCRIPT" $ARGS < out6r.tmp 2>> $ERROR \
 | "$SHOWMAIL" \
 > out7.tmp
 
diff -r f8275d357b55 -r 295bb865bfe9 tests/test_person_invitation_counter.sh
--- a/tests/test_person_invitation_counter.sh	Sat Oct 17 19:49:44 2015 +0200
+++ b/tests/test_person_invitation_counter.sh	Sat Oct 17 19:52:09 2015 +0200
@@ -134,8 +134,7 @@
 && echo "Success" \
 || echo "Failed"
 
-   grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$SENDER/objects/event6@example.com" \
-&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T160000' "$STORE/$SENDER/objects/event6@example.com" \
+   grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T160000' "$STORE/$SENDER/objects/event6@example.com" \
 && echo "Success" \
 || echo "Failed"
 
diff -r f8275d357b55 -r 295bb865bfe9 tests/test_resource_invitation_add.sh
--- a/tests/test_resource_invitation_add.sh	Sat Oct 17 19:49:44 2015 +0200
+++ b/tests/test_resource_invitation_add.sh	Sat Oct 17 19:52:09 2015 +0200
@@ -94,6 +94,7 @@
 # Present the refresh message to the organiser.
 
   "$PERSON_SCRIPT" $ARGS < out3.tmp 2>> $ERROR \
+| tee out4r.tmp \
 | "$SHOWMAIL" \
 > out4.tmp
 
@@ -103,7 +104,7 @@
 
 # Present the request to the recipient.
 
-  "$RESOURCE_SCRIPT" $ARGS < out4.tmp 2>> $ERROR \
+  "$RESOURCE_SCRIPT" $ARGS < out4r.tmp 2>> $ERROR \
 | tee out5r.tmp \
 | "$SHOWMAIL" \
 > out5.tmp
diff -r f8275d357b55 -r 295bb865bfe9 tests/test_resource_invitation_constraints.sh
--- a/tests/test_resource_invitation_constraints.sh	Sat Oct 17 19:49:44 2015 +0200
+++ b/tests/test_resource_invitation_constraints.sh	Sat Oct 17 19:52:09 2015 +0200
@@ -82,12 +82,12 @@
 | "$SHOWMAIL" \
 > out2.tmp
 
-   ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE" \
+   ( ! [ -e "$FBSENDEROTHERFILE" ] \
+  || ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE") \
 && echo "Success" \
 || echo "Failed"
 
-   grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$SENDER/objects/event13@example.com" \
-&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
+   grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
 && echo "Success" \
 || echo "Failed"
 
diff -r f8275d357b55 -r 295bb865bfe9 tests/test_resource_invitation_constraints_alternative.sh
--- a/tests/test_resource_invitation_constraints_alternative.sh	Sat Oct 17 19:49:44 2015 +0200
+++ b/tests/test_resource_invitation_constraints_alternative.sh	Sat Oct 17 19:52:09 2015 +0200
@@ -87,8 +87,7 @@
 && echo "Success" \
 || echo "Failed"
 
-   grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$SENDER/objects/event13@example.com" \
-&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
+   grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
 && echo "Success" \
 || echo "Failed"