1.1 --- a/tests/test_resource_invitation_constraints_quota_recurring.sh Thu Mar 10 01:43:31 2016 +0100
1.2 +++ b/tests/test_resource_invitation_constraints_quota_recurring.sh Fri Mar 11 01:33:45 2016 +0100
1.3 @@ -4,10 +4,7 @@
1.4
1.5 USER="mailto:resource-car-porsche911@example.com"
1.6 SENDER="mailto:paul.boddie@example.com"
1.7 -FBFILE="$STORE/$USER/freebusy"
1.8 -FBSENDERFILE="$STORE/$SENDER/freebusy"
1.9 QUOTA="$USER"
1.10 -JOURNALFILE="$JOURNAL/$QUOTA/journal/$SENDER"
1.11
1.12 mkdir -p "$PREFS/$USER"
1.13 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
1.14 @@ -19,8 +16,7 @@
1.15
1.16 # Employ a user-specific quota (no argument with the functions above).
1.17
1.18 -mkdir -p "$JOURNAL/$QUOTA"
1.19 -echo '* PT10H' > "$JOURNAL/$QUOTA/limits"
1.20 +"$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT10H' $SET_QUOTA_LIMIT_ARGS
1.21
1.22 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-car-all.txt" 2>> $ERROR \
1.23 | "$SHOWMAIL" \
1.24 @@ -35,8 +31,11 @@
1.25
1.26 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-car-recurring.txt" 2>> $ERROR
1.27
1.28 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.29 -&& grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBSENDERFILE" \
1.30 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.31 +> out0f.tmp
1.32 +
1.33 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out0f.tmp" \
1.34 +&& grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out0f.tmp" \
1.35 && echo "Success" \
1.36 || echo "Failed"
1.37
1.38 @@ -52,16 +51,20 @@
1.39 && echo "Success" \
1.40 || echo "Failed"
1.41
1.42 - ! [ -e "$FBFILE" ] \
1.43 -|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.44 - && ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE" ) \
1.45 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.46 +> out1f.tmp
1.47 +
1.48 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out1f.tmp" \
1.49 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out1f.tmp" \
1.50 && echo "Success" \
1.51 || echo "Failed"
1.52
1.53 # Check the quota (event is not confirmed).
1.54
1.55 - ! [ -e "$JOURNALFILE" ] \
1.56 -|| ! grep -q "event24@example.com" "$JOURNALFILE" \
1.57 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.58 +> out1e.tmp
1.59 +
1.60 + ! grep -q "event24@example.com" "out1e.tmp" \
1.61 && echo "Success" \
1.62 || echo "Failed"
1.63
1.64 @@ -70,9 +73,12 @@
1.65 sed 's/FREQ=DAILY/FREQ=DAILY;COUNT=11/;' "$TEMPLATES/event-request-car-recurring.txt" \
1.66 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.67
1.68 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.69 -&& grep -q "^20141205T150000Z${TAB}20141205T160000Z" "$FBSENDERFILE" \
1.70 -&& grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBSENDERFILE" \
1.71 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.72 +> out1s.tmp
1.73 +
1.74 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out1s.tmp" \
1.75 +&& grep -q "^20141205T150000Z${TAB}20141205T160000Z" "out1s.tmp" \
1.76 +&& grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out1s.tmp" \
1.77 && echo "Success" \
1.78 || echo "Failed"
1.79
1.80 @@ -89,17 +95,21 @@
1.81 && echo "Success" \
1.82 || echo "Failed"
1.83
1.84 - ! [ -e "$FBFILE" ] \
1.85 -|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.86 - && ! grep -q "^20141205T150000Z${TAB}20141205T160000Z" "$FBFILE" \
1.87 - && ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE" ) \
1.88 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.89 +> out2f.tmp
1.90 +
1.91 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f.tmp" \
1.92 +&& ! grep -q "^20141205T150000Z${TAB}20141205T160000Z" "out2f.tmp" \
1.93 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out2f.tmp" \
1.94 && echo "Success" \
1.95 || echo "Failed"
1.96
1.97 # Check the quota (event is confirmed).
1.98
1.99 - ! [ -e "$JOURNALFILE" ] \
1.100 -|| ! grep -q "event24@example.com" "$JOURNALFILE" \
1.101 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.102 +> out2e.tmp
1.103 +
1.104 + ! grep -q "event24@example.com" "out2e.tmp" \
1.105 && echo "Success" \
1.106 || echo "Failed"
1.107
1.108 @@ -108,9 +118,12 @@
1.109 sed 's/FREQ=DAILY/FREQ=DAILY;COUNT=10/;' "$TEMPLATES/event-request-car-recurring.txt" \
1.110 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.111
1.112 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.113 -&& grep -q "^20141205T150000Z${TAB}20141205T160000Z" "$FBSENDERFILE" \
1.114 -&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBSENDERFILE" \
1.115 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.116 +> out2s.tmp
1.117 +
1.118 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2s.tmp" \
1.119 +&& grep -q "^20141205T150000Z${TAB}20141205T160000Z" "out2s.tmp" \
1.120 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out2s.tmp" \
1.121 && echo "Success" \
1.122 || echo "Failed"
1.123
1.124 @@ -118,25 +131,29 @@
1.125
1.126 sed 's/FREQ=DAILY/FREQ=DAILY;COUNT=10/;' "$TEMPLATES/event-request-car-recurring.txt" \
1.127 | "$RESOURCE_SCRIPT" $ARGS 2>> $ERROR \
1.128 -| tee out2r.tmp \
1.129 +| tee out3r.tmp \
1.130 | "$SHOWMAIL" \
1.131 -> out2.tmp
1.132 +> out3.tmp
1.133
1.134 - grep -q 'METHOD:REPLY' out2.tmp \
1.135 -&& grep -q 'ATTENDEE.*;PARTSTAT=ACCEPTED' out2.tmp \
1.136 + grep -q 'METHOD:REPLY' out3.tmp \
1.137 +&& grep -q 'ATTENDEE.*;PARTSTAT=ACCEPTED' out3.tmp \
1.138 && echo "Success" \
1.139 || echo "Failed"
1.140
1.141 - [ -e "$FBFILE" ] \
1.142 -&& grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.143 -&& grep -q "^20141205T150000Z${TAB}20141205T160000Z" "$FBFILE" \
1.144 -&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE" \
1.145 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.146 +> out3f.tmp
1.147 +
1.148 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3f.tmp" \
1.149 +&& grep -q "^20141205T150000Z${TAB}20141205T160000Z" "out3f.tmp" \
1.150 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out3f.tmp" \
1.151 && echo "Success" \
1.152 || echo "Failed"
1.153
1.154 # Check the quota (event is confirmed).
1.155
1.156 - [ -e "$JOURNALFILE" ] \
1.157 -&& grep -q "event24@example.com" "$JOURNALFILE" \
1.158 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.159 +> out3e.tmp
1.160 +
1.161 + grep -q "event24@example.com" "out3e.tmp" \
1.162 && echo "Success" \
1.163 || echo "Failed"