1.1 --- a/tests/test_resource_invitation_constraints_quota_recurring_limits.sh Thu Mar 10 01:43:31 2016 +0100
1.2 +++ b/tests/test_resource_invitation_constraints_quota_recurring_limits.sh Fri Mar 11 01:33:45 2016 +0100
1.3 @@ -8,13 +8,7 @@
1.4 SENDER2="mailto:vincent.vole@example.com"
1.5 SENDERADDRESS1="paul.boddie@example.com"
1.6 SENDERADDRESS2="vincent.vole@example.com"
1.7 -FBFILE1="$STORE/$USER1/freebusy"
1.8 -FBFILE2="$STORE/$USER2/freebusy"
1.9 -FBSENDERFILE1="$STORE/$SENDER1/freebusy"
1.10 -FBSENDERFILE2="$STORE/$SENDER2/freebusy"
1.11 QUOTA=cars
1.12 -JOURNALFILE1="$JOURNAL/$QUOTA/journal/$SENDER1"
1.13 -JOURNALFILE2="$JOURNAL/$QUOTA/journal/$SENDER2"
1.14
1.15 mkdir -p "$PREFS/$USER1"
1.16 echo 'Europe/Oslo' > "$PREFS/$USER1/TZID"
1.17 @@ -32,11 +26,8 @@
1.18 check_quota $QUOTA
1.19 EOF
1.20
1.21 -mkdir -p "$JOURNAL/$QUOTA"
1.22 -cat > "$JOURNAL/$QUOTA/limits" <<EOF
1.23 -mailto:vincent.vole@example.com PT10H
1.24 -* PT5H
1.25 -EOF
1.26 +"$SET_QUOTA_LIMIT" "$QUOTA" 'mailto:vincent.vole@example.com' 'PT10H' $SET_QUOTA_LIMIT_ARGS
1.27 +"$SET_QUOTA_LIMIT" "$QUOTA" '*' 'PT5H' $SET_QUOTA_LIMIT_ARGS
1.28
1.29 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-car-all.txt" 2>> $ERROR \
1.30 | "$SHOWMAIL" \
1.31 @@ -51,8 +42,11 @@
1.32
1.33 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-cars-recurring.txt" 2>> $ERROR
1.34
1.35 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE1" \
1.36 -&& grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBSENDERFILE1" \
1.37 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER1" "freebusy" \
1.38 +> out0f.tmp
1.39 +
1.40 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out0f.tmp" \
1.41 +&& grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out0f.tmp" \
1.42 && echo "Success" \
1.43 || echo "Failed"
1.44
1.45 @@ -68,19 +62,25 @@
1.46 && echo "Success" \
1.47 || echo "Failed"
1.48
1.49 - ( ! [ -e "$FBFILE1" ] \
1.50 - || ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.51 - && ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE1" )) \
1.52 -&& ( ! [ -e "$FBFILE2" ] \
1.53 - || ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE2" \
1.54 - && ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE2" )) \
1.55 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.56 +> out1f.tmp
1.57 +
1.58 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.59 +> out1f2.tmp
1.60 +
1.61 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out1f.tmp" \
1.62 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out1f.tmp" \
1.63 +&& ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out1f2.tmp" \
1.64 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out1f2.tmp" \
1.65 && echo "Success" \
1.66 || echo "Failed"
1.67
1.68 # Check the quota (event is not confirmed).
1.69
1.70 - ! [ -e "$JOURNALFILE1" ] \
1.71 -|| ! grep -q "event25@example.com" "$JOURNALFILE1" \
1.72 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER1" \
1.73 +> out1e.tmp
1.74 +
1.75 + ! grep -q "event25@example.com" "out1e.tmp" \
1.76 && echo "Success" \
1.77 || echo "Failed"
1.78
1.79 @@ -89,8 +89,11 @@
1.80 sed 's/FREQ=DAILY/FREQ=DAILY;COUNT=5/;' "$TEMPLATES/event-request-cars-recurring.txt" \
1.81 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.82
1.83 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE1" \
1.84 -&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBSENDERFILE1" \
1.85 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER1" "freebusy" \
1.86 +> out1s.tmp
1.87 +
1.88 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out1s.tmp" \
1.89 +&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out1s.tmp" \
1.90 && echo "Success" \
1.91 || echo "Failed"
1.92
1.93 @@ -118,25 +121,29 @@
1.94 && echo "Success" \
1.95 || echo "Failed"
1.96
1.97 - (( ! [ -e "$FBFILE1" ] \
1.98 - || ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.99 - && ! grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBFILE1" )) \
1.100 - && [ -e "$FBFILE2" ] \
1.101 - && grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE2" \
1.102 - && grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBFILE2" ) \
1.103 -|| (( ! [ -e "$FBFILE2" ] \
1.104 - || ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE2" \
1.105 - && ! grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBFILE2" )) \
1.106 - && [ -e "$FBFILE1" ] \
1.107 - && grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.108 - && grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBFILE1" ) \
1.109 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.110 +> out2f.tmp
1.111 +
1.112 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.113 +> out2f2.tmp
1.114 +
1.115 + ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f.tmp" \
1.116 + && ! grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out2f.tmp" \
1.117 + && grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f2.tmp" \
1.118 + && grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out2f2.tmp" ) \
1.119 +|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f2.tmp" \
1.120 + && ! grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out2f2.tmp" \
1.121 + && grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f.tmp" \
1.122 + && grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out2f.tmp" ) \
1.123 && echo "Success" \
1.124 || echo "Failed"
1.125
1.126 # Check the quota (event is confirmed for one resource).
1.127
1.128 - ! [ -e "$JOURNALFILE1" ] \
1.129 -|| grep -q "event25@example.com" "$JOURNALFILE1" \
1.130 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER1" \
1.131 +> out2e.tmp
1.132 +
1.133 + grep -q "event25@example.com" "out2e.tmp" \
1.134 && echo "Success" \
1.135 || echo "Failed"
1.136
1.137 @@ -144,8 +151,11 @@
1.138
1.139 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-cars-recurring.txt" 2>> $ERROR
1.140
1.141 - ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE1" \
1.142 -&& ! grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBSENDERFILE1" \
1.143 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER1" "freebusy" \
1.144 +> out2s.tmp
1.145 +
1.146 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2s.tmp" \
1.147 +&& ! grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out2s.tmp" \
1.148 && echo "Success" \
1.149 || echo "Failed"
1.150
1.151 @@ -160,19 +170,25 @@
1.152 && echo "Success" \
1.153 || echo "Failed"
1.154
1.155 - ( ! [ -e "$FBFILE1" ] \
1.156 - || ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.157 - && ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE1" )) \
1.158 -&& ( ! [ -e "$FBFILE2" ] \
1.159 - || ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE2" \
1.160 - && ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "$FBFILE2" )) \
1.161 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.162 +> out3f.tmp
1.163 +
1.164 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.165 +> out3f2.tmp
1.166 +
1.167 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3f.tmp" \
1.168 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out3f.tmp" \
1.169 +&& ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3f2.tmp" \
1.170 +&& ! grep -q "^20141206T150000Z${TAB}20141206T160000Z" "out3f2.tmp" \
1.171 && echo "Success" \
1.172 || echo "Failed"
1.173
1.174 # Check the quota (event is retracted).
1.175
1.176 - ! [ -e "$JOURNALFILE1" ] \
1.177 -|| ! grep -q "event25@example.com" "$JOURNALFILE1" \
1.178 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER1" \
1.179 +> out3e.tmp
1.180 +
1.181 + ! grep -q "event25@example.com" "out3e.tmp" \
1.182 && echo "Success" \
1.183 || echo "Failed"
1.184
1.185 @@ -182,8 +198,11 @@
1.186 | sed "s/$SENDERADDRESS1/$SENDERADDRESS2/;" \
1.187 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.188
1.189 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE2" \
1.190 -&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBSENDERFILE2" \
1.191 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER2" "freebusy" \
1.192 +> out3s.tmp
1.193 +
1.194 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3s.tmp" \
1.195 +&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out3s.tmp" \
1.196 && echo "Success" \
1.197 || echo "Failed"
1.198
1.199 @@ -211,18 +230,24 @@
1.200 && echo "Success" \
1.201 || echo "Failed"
1.202
1.203 - [ -e "$FBFILE1" ] \
1.204 -&& grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE1" \
1.205 -&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBFILE1" \
1.206 -&& [ -e "$FBFILE2" ] \
1.207 -&& grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE2" \
1.208 -&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "$FBFILE2" \
1.209 + "$LIST_SCRIPT" $LIST_ARGS "$USER1" "freebusy" \
1.210 +> out4f.tmp
1.211 +
1.212 + "$LIST_SCRIPT" $LIST_ARGS "$USER2" "freebusy" \
1.213 +> out4f2.tmp
1.214 +
1.215 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out4f.tmp" \
1.216 +&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out4f.tmp" \
1.217 +&& grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out4f2.tmp" \
1.218 +&& grep -q "^20141130T150000Z${TAB}20141130T160000Z" "out4f2.tmp" \
1.219 && echo "Success" \
1.220 || echo "Failed"
1.221
1.222 # Check the quota (event is confirmed for both resources).
1.223
1.224 - [ -e "$JOURNALFILE2" ] \
1.225 -&& grep -q "event25@example.com" "$JOURNALFILE2" \
1.226 + "$LIST_SCRIPT" $LIST_ARGS "$QUOTA" "entries" "$SENDER2" \
1.227 +> out4e.tmp
1.228 +
1.229 + grep -q "event25@example.com" "out4e.tmp" \
1.230 && echo "Success" \
1.231 || echo "Failed"