1.1 --- a/tests/test_resource_invitation_constraints_quota.sh Thu Mar 10 01:43:31 2016 +0100
1.2 +++ b/tests/test_resource_invitation_constraints_quota.sh Fri Mar 11 01:33:45 2016 +0100
1.3 @@ -5,11 +5,7 @@
1.4 USER1="mailto:resource-car-porsche911@example.com"
1.5 USER2="mailto:resource-car-fiat500@example.com"
1.6 SENDER="mailto:paul.boddie@example.com"
1.7 -FBFILE1="$STORE/$USER1/freebusy"
1.8 -FBFILE2="$STORE/$USER2/freebusy"
1.9 -FBSENDERFILE="$STORE/$SENDER/freebusy"
1.10 QUOTA=cars
1.11 -JOURNALFILE="$JOURNAL/$QUOTA/journal/$SENDER"
1.12
1.13 mkdir -p "$PREFS/$USER1"
1.14 echo 'Europe/Oslo' > "$PREFS/$USER1/TZID"
1.15 @@ -27,8 +23,7 @@
1.16 check_quota $QUOTA
1.17 EOF
1.18
1.19 -mkdir -p "$JOURNAL/$QUOTA"
1.20 -echo '* PT1H' > "$JOURNAL/$QUOTA/limits"
1.21 +"$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT1H' $SET_QUOTA_LIMIT_ARGS
1.22
1.23 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-car.txt" 2>> $ERROR \
1.24 | "$SHOWMAIL" \
1.25 @@ -43,7 +38,9 @@
1.26
1.27 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-car.txt" 2>> $ERROR
1.28
1.29 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.30 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.31 +| tee out0s.tmp \
1.32 +| grep -q "^20141126T150000Z${TAB}20141126T160000Z" \
1.33 && echo "Success" \
1.34 || echo "Failed"
1.35
1.36 @@ -59,15 +56,17 @@
1.37 && echo "Success" \
1.38 || echo "Failed"
1.39
1.40 - [ -e "$FBFILE1" ] \
1.41 -&& grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.42 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.43 +| tee out1f.tmp \
1.44 +| grep -q "^20141126T150000Z${TAB}20141126T160000Z" \
1.45 && echo "Success" \
1.46 || echo "Failed"
1.47
1.48 # Check the quota (event is confirmed).
1.49
1.50 - [ -e "$JOURNALFILE" ] \
1.51 -&& grep -q "event21@example.com" "$JOURNALFILE" \
1.52 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.53 +| tee out1e.tmp \
1.54 +| grep -q "event21@example.com" \
1.55 && echo "Success" \
1.56 || echo "Failed"
1.57
1.58 @@ -75,7 +74,9 @@
1.59
1.60 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-car-conflict.txt" 2>> $ERROR
1.61
1.62 - grep -q "^20141126T153000Z${TAB}20141126T163000Z" "$FBSENDERFILE" \
1.63 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.64 +| tee out1s.tmp \
1.65 +| grep -q "^20141126T153000Z${TAB}20141126T163000Z" \
1.66 && echo "Success" \
1.67 || echo "Failed"
1.68
1.69 @@ -91,28 +92,34 @@
1.70 && echo "Success" \
1.71 || echo "Failed"
1.72
1.73 - ! [ -e "$FBFILE2" ] \
1.74 -|| ! grep -q "^20141126T153000Z${TAB}20141126T163000Z" "$FBFILE2" \
1.75 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.76 +> out2f.tmp
1.77 +
1.78 + ! grep -q "^20141126T153000Z${TAB}20141126T163000Z" "out2f.tmp" \
1.79 && echo "Success" \
1.80 || echo "Failed"
1.81
1.82 # Check the quota (event is not confirmed).
1.83
1.84 - [ -e "$JOURNALFILE" ] \
1.85 -&& grep -q "event21@example.com" "$JOURNALFILE" \
1.86 -&& ! grep -q "event22@example.com" "$JOURNALFILE" \
1.87 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.88 +> out2e.tmp
1.89 +
1.90 + grep -q "event21@example.com" "out2e.tmp" \
1.91 +&& ! grep -q "event22@example.com" "out2e.tmp" \
1.92 && echo "Success" \
1.93 || echo "Failed"
1.94
1.95 # Increase the quota.
1.96
1.97 -echo '* PT2H' > "$JOURNAL/$QUOTA/limits"
1.98 +"$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT2H' $SET_QUOTA_LIMIT_ARGS
1.99
1.100 # Attempt to schedule the event again.
1.101
1.102 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-car-conflict.txt" 2>> $ERROR
1.103
1.104 - grep -q "^20141126T153000Z${TAB}20141126T163000Z" "$FBSENDERFILE" \
1.105 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.106 +| tee out2s.tmp \
1.107 +| grep -q "^20141126T153000Z${TAB}20141126T163000Z" \
1.108 && echo "Success" \
1.109 || echo "Failed"
1.110
1.111 @@ -128,16 +135,19 @@
1.112 && echo "Success" \
1.113 || echo "Failed"
1.114
1.115 - [ -e "$FBFILE2" ] \
1.116 -&& grep -q "^20141126T153000Z${TAB}20141126T163000Z" "$FBFILE2" \
1.117 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.118 +| tee out3f.tmp \
1.119 +| grep -q "^20141126T153000Z${TAB}20141126T163000Z" \
1.120 && echo "Success" \
1.121 || echo "Failed"
1.122
1.123 # Check the quota (event is confirmed).
1.124
1.125 - [ -e "$JOURNALFILE" ] \
1.126 -&& grep -q "event21@example.com" "$JOURNALFILE" \
1.127 -&& grep -q "event22@example.com" "$JOURNALFILE" \
1.128 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.129 +> out3e.tmp
1.130 +
1.131 + grep -q "event21@example.com" "out3e.tmp" \
1.132 +&& grep -q "event22@example.com" "out3e.tmp" \
1.133 && echo "Success" \
1.134 || echo "Failed"
1.135
1.136 @@ -145,7 +155,10 @@
1.137
1.138 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-car.txt" 2>> $ERROR
1.139
1.140 - ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.141 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.142 +> out3s.tmp
1.143 +
1.144 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3s.tmp" \
1.145 && echo "Success" \
1.146 || echo "Failed"
1.147
1.148 @@ -160,15 +173,20 @@
1.149 && echo "Success" \
1.150 || echo "Failed"
1.151
1.152 - ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.153 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.154 +> out4f.tmp
1.155 +
1.156 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out4f.tmp" \
1.157 && echo "Success" \
1.158 || echo "Failed"
1.159
1.160 # Check the quota (event is retracted).
1.161
1.162 - [ -e "$JOURNALFILE" ] \
1.163 -&& ! grep -q "event21@example.com" "$JOURNALFILE" \
1.164 -&& grep -q "event22@example.com" "$JOURNALFILE" \
1.165 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.166 +> out4e.tmp
1.167 +
1.168 + ! grep -q "event21@example.com" "out4e.tmp" \
1.169 +&& grep -q "event22@example.com" "out4e.tmp" \
1.170 && echo "Success" \
1.171 || echo "Failed"
1.172
1.173 @@ -198,16 +216,19 @@
1.174 && echo "Success" \
1.175 || echo "Failed"
1.176
1.177 - [ -e "$FBFILE2" ] \
1.178 -&& grep -q "^20141126T153000Z${TAB}20141126T163000Z" "$FBFILE2" \
1.179 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.180 +| tee out5f.tmp \
1.181 +| grep -q "^20141126T153000Z${TAB}20141126T163000Z" \
1.182 && echo "Success" \
1.183 || echo "Failed"
1.184
1.185 # Check the quota (event is still confirmed).
1.186
1.187 - [ -e "$JOURNALFILE" ] \
1.188 -&& ! grep -q "event21@example.com" "$JOURNALFILE" \
1.189 -&& grep -q "event22@example.com" "$JOURNALFILE" \
1.190 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.191 +> out5e.tmp
1.192 +
1.193 + ! grep -q "event21@example.com" "out5e.tmp" \
1.194 +&& grep -q "event22@example.com" "out5e.tmp" \
1.195 && echo "Success" \
1.196 || echo "Failed"
1.197
1.198 @@ -215,7 +236,9 @@
1.199
1.200 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-car.txt" 2>> $ERROR
1.201
1.202 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.203 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.204 +| tee out5s.tmp \
1.205 +| grep -q "^20141126T150000Z${TAB}20141126T160000Z" \
1.206 && echo "Success" \
1.207 || echo "Failed"
1.208
1.209 @@ -231,15 +254,20 @@
1.210 && echo "Success" \
1.211 || echo "Failed"
1.212
1.213 - ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.214 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.215 +> out6f.tmp
1.216 +
1.217 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out6f.tmp" \
1.218 && echo "Success" \
1.219 || echo "Failed"
1.220
1.221 # Check the quota (event is still retracted and not newly confirmed).
1.222
1.223 - [ -e "$JOURNALFILE" ] \
1.224 -&& ! grep -q "event21@example.com" "$JOURNALFILE" \
1.225 -&& grep -q "event22@example.com" "$JOURNALFILE" \
1.226 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.227 +> out6e.tmp
1.228 +
1.229 + ! grep -q "event21@example.com" "out6e.tmp" \
1.230 +&& grep -q "event22@example.com" "out6e.tmp" \
1.231 && echo "Success" \
1.232 || echo "Failed"
1.233
1.234 @@ -247,8 +275,11 @@
1.235
1.236 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-car-moved.txt" 2>> $ERROR
1.237
1.238 - ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.239 -&& grep -q "^20141126T143000Z${TAB}20141126T153000Z" "$FBSENDERFILE" \
1.240 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.241 +> out6s.tmp
1.242 +
1.243 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out6s.tmp" \
1.244 +&& grep -q "^20141126T143000Z${TAB}20141126T153000Z" "out6s.tmp" \
1.245 && echo "Success" \
1.246 || echo "Failed"
1.247
1.248 @@ -264,27 +295,33 @@
1.249 && echo "Success" \
1.250 || echo "Failed"
1.251
1.252 - grep -q "^20141126T143000Z${TAB}20141126T153000Z" "$FBFILE1" \
1.253 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.254 +| tee out7f.tmp \
1.255 +| grep -q "^20141126T143000Z${TAB}20141126T153000Z" \
1.256 && echo "Success" \
1.257 || echo "Failed"
1.258
1.259 # Check the quota (event is newly confirmed).
1.260
1.261 - [ -e "$JOURNALFILE" ] \
1.262 -&& grep -q "event21@example.com" "$JOURNALFILE" \
1.263 -&& grep -q "event22@example.com" "$JOURNALFILE" \
1.264 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.265 +> out7e.tmp
1.266 +
1.267 + grep -q "event21@example.com" "out7e.tmp" \
1.268 +&& grep -q "event22@example.com" "out7e.tmp" \
1.269 && echo "Success" \
1.270 || echo "Failed"
1.271
1.272 # Increase the quota.
1.273
1.274 -echo '* PT3H' > "$JOURNAL/$QUOTA/limits"
1.275 +"$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT3H' $SET_QUOTA_LIMIT_ARGS
1.276
1.277 # Attempt to schedule an event involving both resources.
1.278
1.279 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-cars.txt" 2>> $ERROR
1.280
1.281 - grep -q "^20141127T150000Z${TAB}20141127T160000Z" "$FBSENDERFILE" \
1.282 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.283 +| tee out7s.tmp \
1.284 +| grep -q "^20141127T150000Z${TAB}20141127T160000Z" \
1.285 && echo "Success" \
1.286 || echo "Failed"
1.287
1.288 @@ -311,16 +348,23 @@
1.289 && echo "Success" \
1.290 || echo "Failed"
1.291
1.292 - ( grep -q "^20141127T150000Z${TAB}20141127T160000Z" "$FBFILE1" \
1.293 - && ! grep -q "^20141127T150000Z${TAB}20141127T160000Z" "$FBFILE2" ) \
1.294 -|| ( ! grep -q "^20141127T150000Z${TAB}20141127T160000Z" "$FBFILE1" \
1.295 - && grep -q "^20141127T150000Z${TAB}20141127T160000Z" "$FBFILE2" ) \
1.296 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.297 +> out8f.tmp
1.298 +
1.299 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.300 +> out8f2.tmp
1.301 +
1.302 + ( grep -q "^20141127T150000Z${TAB}20141127T160000Z" "out8f.tmp" \
1.303 + && ! grep -q "^20141127T150000Z${TAB}20141127T160000Z" "out8f2.tmp" ) \
1.304 +|| ( ! grep -q "^20141127T150000Z${TAB}20141127T160000Z" "out8f.tmp" \
1.305 + && grep -q "^20141127T150000Z${TAB}20141127T160000Z" "out8f2.tmp" ) \
1.306 && echo "Success" \
1.307 || echo "Failed"
1.308
1.309 # Check the quota (event is confirmed, but only for one resource).
1.310
1.311 - [ -e "$JOURNALFILE" ] \
1.312 -&& grep -q "event23@example.com" "$JOURNALFILE" \
1.313 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER" \
1.314 +| tee out8e.tmp \
1.315 +| grep -q "event23@example.com" \
1.316 && echo "Success" \
1.317 || echo "Failed"