1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/tests/common.sh Fri Jan 29 16:44:32 2016 +0100 1.3 @@ -0,0 +1,45 @@ 1.4 +#!/bin/sh 1.5 + 1.6 +THIS_DIR=`dirname "$0"` 1.7 +BASE_DIR="$THIS_DIR/.." 1.8 + 1.9 +STORE=/tmp/store 1.10 +STATIC=/tmp/static 1.11 +PREFS=/tmp/prefs 1.12 + 1.13 +ARGS="-S $STORE -P $STATIC -p $PREFS -d" 1.14 + 1.15 +ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 1.16 +ACCEPT_ARGS="accept $STORE $PREFS" 1.17 + 1.18 +COUNTER_SCRIPT="$THIS_DIR/test_handle.py" 1.19 +COUNTER_ARGS="counter $STORE $PREFS" 1.20 + 1.21 +DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 1.22 +DECLINE_ARGS="decline $STORE $PREFS" 1.23 + 1.24 +FREEBUSY_SCRIPT="$BASE_DIR/tools/make_freebusy.py" 1.25 +FREEBUSY_ARGS="-s -n" 1.26 + 1.27 +OUTGOING_SCRIPT="$BASE_DIR/imip_person_outgoing.py" 1.28 + 1.29 +PERSON_SCRIPT="$BASE_DIR/imip_person.py" 1.30 + 1.31 +RESOURCE_SCRIPT="$BASE_DIR/imip_resource.py" 1.32 + 1.33 +SHOWMAIL="$BASE_DIR/tools/showmail.py" 1.34 + 1.35 +TAB=`printf '\t'` 1.36 + 1.37 +TEMPLATES="$THIS_DIR/templates" 1.38 + 1.39 +ERROR=err.tmp 1.40 + 1.41 +PYTHONPATH="$BASE_DIR" 1.42 +export PYTHONPATH 1.43 + 1.44 +rm -rf $STORE 1.45 +rm -rf $STATIC 1.46 +rm -rf $PREFS 1.47 +rm -f $ERROR 1.48 +rm -f out*.tmp
2.1 --- a/tests/test_freebusy_publishing.sh Fri Jan 29 15:31:04 2016 +0100 2.2 +++ b/tests/test_freebusy_publishing.sh Fri Jan 29 16:44:32 2016 +0100 2.3 @@ -1,30 +1,11 @@ 2.4 #!/bin/sh 2.5 2.6 -THIS_DIR=`dirname $0` 2.7 +. "`dirname \"$0\"`/common.sh" 2.8 2.9 -TEMPLATES="$THIS_DIR/templates" 2.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 2.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 2.12 -STORE=/tmp/store 2.13 -STATIC=/tmp/static 2.14 -PREFS=/tmp/prefs 2.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 2.16 USER="mailto:paul.boddie@example.com" 2.17 SENDER="mailto:resource-room-confroom@example.com" 2.18 FBFILE="$STORE/$USER/freebusy" 2.19 FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER" 2.20 -TAB=`printf '\t'` 2.21 - 2.22 -PYTHONPATH="$THIS_DIR/.." 2.23 -export PYTHONPATH 2.24 - 2.25 -ERROR=err.tmp 2.26 - 2.27 -rm -rf $STORE 2.28 -rm -rf $STATIC 2.29 -rm -rf $PREFS 2.30 -rm -f $ERROR 2.31 -rm -f out*.tmp 2.32 2.33 mkdir -p "$PREFS/$USER" 2.34 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
3.1 --- a/tests/test_multiple_invitation.sh Fri Jan 29 15:31:04 2016 +0100 3.2 +++ b/tests/test_multiple_invitation.sh Fri Jan 29 16:44:32 2016 +0100 3.3 @@ -1,23 +1,9 @@ 3.4 #!/bin/sh 3.5 3.6 -THIS_DIR=`dirname $0` 3.7 +. "`dirname \"$0\"`/common.sh" 3.8 3.9 -TEMPLATES="$THIS_DIR/templates" 3.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 3.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 3.12 -STORE=/tmp/store 3.13 -STATIC=/tmp/static 3.14 -PREFS=/tmp/prefs 3.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 3.16 ROOM="mailto:resource-room-confroom@example.com" 3.17 CAR="mailto:resource-car-porsche911@example.com" 3.18 -ERROR=err.tmp 3.19 - 3.20 -rm -rf $STORE 3.21 -rm -rf $STATIC 3.22 -rm -rf $PREFS 3.23 -rm -f $ERROR 3.24 -rm -f out*.tmp 3.25 3.26 mkdir -p "$PREFS/$ROOM" 3.27 echo 'Europe/Oslo' > "$PREFS/$ROOM/TZID"
4.1 --- a/tests/test_outgoing_invitation.sh Fri Jan 29 15:31:04 2016 +0100 4.2 +++ b/tests/test_outgoing_invitation.sh Fri Jan 29 16:44:32 2016 +0100 4.3 @@ -1,24 +1,9 @@ 4.4 #!/bin/sh 4.5 4.6 -THIS_DIR=`dirname $0` 4.7 +. "`dirname \"$0\"`/common.sh" 4.8 4.9 -TEMPLATES="$THIS_DIR/templates" 4.10 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 4.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 4.12 -STORE=/tmp/store 4.13 -STATIC=/tmp/static 4.14 -PREFS=/tmp/prefs 4.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 4.16 USER="mailto:paul.boddie@example.com" 4.17 FBFILE="$STORE/$USER/freebusy" 4.18 -TAB=`printf '\t'` 4.19 -ERROR=err.tmp 4.20 - 4.21 -rm -rf $STORE 4.22 -rm -rf $STATIC 4.23 -rm -rf $PREFS 4.24 -rm -f $ERROR 4.25 -rm -f out*.tmp 4.26 4.27 mkdir -p "$PREFS/$USER" 4.28 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
5.1 --- a/tests/test_person_invitation.sh Fri Jan 29 15:31:04 2016 +0100 5.2 +++ b/tests/test_person_invitation.sh Fri Jan 29 16:44:32 2016 +0100 5.3 @@ -1,38 +1,11 @@ 5.4 #!/bin/sh 5.5 5.6 -THIS_DIR=`dirname $0` 5.7 +. "`dirname \"$0\"`/common.sh" 5.8 5.9 -TEMPLATES="$THIS_DIR/templates" 5.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 5.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 5.12 -STORE=/tmp/store 5.13 -STATIC=/tmp/static 5.14 -PREFS=/tmp/prefs 5.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 5.16 USER="mailto:vincent.vole@example.com" 5.17 SENDER="mailto:paul.boddie@example.com" 5.18 FBFILE="$STORE/$USER/freebusy" 5.19 FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER" 5.20 -TAB=`printf '\t'` 5.21 - 5.22 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 5.23 - 5.24 -PYTHONPATH="$THIS_DIR/.." 5.25 -export PYTHONPATH 5.26 - 5.27 -ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 5.28 -ACCEPT_ARGS="accept $STORE $PREFS" 5.29 - 5.30 -DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 5.31 -DECLINE_ARGS="decline $STORE $PREFS" 5.32 - 5.33 -ERROR=err.tmp 5.34 - 5.35 -rm -rf $STORE 5.36 -rm -rf $STATIC 5.37 -rm -rf $PREFS 5.38 -rm -f $ERROR 5.39 -rm -f out*.tmp 5.40 5.41 mkdir -p "$PREFS/$USER" 5.42 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
6.1 --- a/tests/test_person_invitation_add.sh Fri Jan 29 15:31:04 2016 +0100 6.2 +++ b/tests/test_person_invitation_add.sh Fri Jan 29 16:44:32 2016 +0100 6.3 @@ -1,40 +1,13 @@ 6.4 #!/bin/sh 6.5 6.6 -THIS_DIR=`dirname $0` 6.7 +. "`dirname \"$0\"`/common.sh" 6.8 6.9 -TEMPLATES="$THIS_DIR/templates" 6.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 6.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 6.12 -STORE=/tmp/store 6.13 -STATIC=/tmp/static 6.14 -PREFS=/tmp/prefs 6.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 6.16 USER="mailto:vincent.vole@example.com" 6.17 SENDER="mailto:paul.boddie@example.com" 6.18 FBFILE="$STORE/$USER/freebusy" 6.19 FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER" 6.20 FBSENDERFILE="$STORE/$SENDER/freebusy" 6.21 FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER" 6.22 -TAB=`printf '\t'` 6.23 - 6.24 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 6.25 - 6.26 -PYTHONPATH="$THIS_DIR/.." 6.27 -export PYTHONPATH 6.28 - 6.29 -ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 6.30 -ACCEPT_ARGS="accept $STORE $PREFS" 6.31 - 6.32 -DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 6.33 -DECLINE_ARGS="decline $STORE $PREFS" 6.34 - 6.35 -ERROR=err.tmp 6.36 - 6.37 -rm -rf $STORE 6.38 -rm -rf $STATIC 6.39 -rm -rf $PREFS 6.40 -rm -f $ERROR 6.41 -rm -f out*.tmp 6.42 6.43 mkdir -p "$PREFS/$USER" 6.44 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
7.1 --- a/tests/test_person_invitation_counter.sh Fri Jan 29 15:31:04 2016 +0100 7.2 +++ b/tests/test_person_invitation_counter.sh Fri Jan 29 16:44:32 2016 +0100 7.3 @@ -1,14 +1,7 @@ 7.4 #!/bin/sh 7.5 7.6 -THIS_DIR=`dirname $0` 7.7 +. "`dirname \"$0\"`/common.sh" 7.8 7.9 -TEMPLATES="$THIS_DIR/templates" 7.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 7.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 7.12 -STORE=/tmp/store 7.13 -STATIC=/tmp/static 7.14 -PREFS=/tmp/prefs 7.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 7.16 USER="mailto:vincent.vole@example.com" 7.17 SENDER="mailto:paul.boddie@example.com" 7.18 FBFILE="$STORE/$USER/freebusy" 7.19 @@ -16,29 +9,6 @@ 7.20 FBSENDERFILE="$STORE/$SENDER/freebusy" 7.21 FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER" 7.22 FBSENDERREQUESTS="$STORE/$SENDER/requests" 7.23 -TAB=`printf '\t'` 7.24 - 7.25 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 7.26 - 7.27 -PYTHONPATH="$THIS_DIR/.." 7.28 -export PYTHONPATH 7.29 - 7.30 -ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 7.31 -ACCEPT_ARGS="accept $STORE $PREFS" 7.32 - 7.33 -COUNTER_SCRIPT="$THIS_DIR/test_handle.py" 7.34 -COUNTER_ARGS="counter $STORE $PREFS" 7.35 - 7.36 -DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 7.37 -DECLINE_ARGS="decline $STORE $PREFS" 7.38 - 7.39 -ERROR=err.tmp 7.40 - 7.41 -rm -rf $STORE 7.42 -rm -rf $STATIC 7.43 -rm -rf $PREFS 7.44 -rm -f $ERROR 7.45 -rm -f out*.tmp 7.46 7.47 mkdir -p "$PREFS/$USER" 7.48 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
8.1 --- a/tests/test_person_invitation_recurring.sh Fri Jan 29 15:31:04 2016 +0100 8.2 +++ b/tests/test_person_invitation_recurring.sh Fri Jan 29 16:44:32 2016 +0100 8.3 @@ -1,39 +1,12 @@ 8.4 #!/bin/sh 8.5 8.6 -THIS_DIR=`dirname $0` 8.7 +. "`dirname \"$0\"`/common.sh" 8.8 8.9 -TEMPLATES="$THIS_DIR/templates" 8.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 8.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 8.12 -STORE=/tmp/store 8.13 -STATIC=/tmp/static 8.14 -PREFS=/tmp/prefs 8.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 8.16 USER="mailto:vincent.vole@example.com" 8.17 SENDER="mailto:paul.boddie@example.com" 8.18 FBFILE="$STORE/$USER/freebusy" 8.19 FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER" 8.20 FBSENDERFILE="$STORE/$SENDER/freebusy" 8.21 -TAB=`printf '\t'` 8.22 - 8.23 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 8.24 - 8.25 -PYTHONPATH="$THIS_DIR/.." 8.26 -export PYTHONPATH 8.27 - 8.28 -ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 8.29 -ACCEPT_ARGS="accept $STORE $PREFS" 8.30 - 8.31 -DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 8.32 -DECLINE_ARGS="decline $STORE $PREFS" 8.33 - 8.34 -ERROR=err.tmp 8.35 - 8.36 -rm -rf $STORE 8.37 -rm -rf $STATIC 8.38 -rm -rf $PREFS 8.39 -rm -f $ERROR 8.40 -rm -f out*.tmp 8.41 8.42 mkdir -p "$PREFS/$USER" 8.43 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
9.1 --- a/tests/test_person_invitation_refresh.sh Fri Jan 29 15:31:04 2016 +0100 9.2 +++ b/tests/test_person_invitation_refresh.sh Fri Jan 29 16:44:32 2016 +0100 9.3 @@ -1,39 +1,12 @@ 9.4 #!/bin/sh 9.5 9.6 -THIS_DIR=`dirname $0` 9.7 +. "`dirname \"$0\"`/common.sh" 9.8 9.9 -TEMPLATES="$THIS_DIR/templates" 9.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 9.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 9.12 -STORE=/tmp/store 9.13 -STATIC=/tmp/static 9.14 -PREFS=/tmp/prefs 9.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 9.16 USER="mailto:vincent.vole@example.com" 9.17 SENDER="mailto:paul.boddie@example.com" 9.18 FBFILE="$STORE/$USER/freebusy" 9.19 FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER" 9.20 FBSENDERFILE="$STORE/$SENDER/freebusy" 9.21 -TAB=`printf '\t'` 9.22 - 9.23 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 9.24 - 9.25 -PYTHONPATH="$THIS_DIR/.." 9.26 -export PYTHONPATH 9.27 - 9.28 -ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 9.29 -ACCEPT_ARGS="accept $STORE $PREFS" 9.30 - 9.31 -DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 9.32 -DECLINE_ARGS="decline $STORE $PREFS" 9.33 - 9.34 -ERROR=err.tmp 9.35 - 9.36 -rm -rf $STORE 9.37 -rm -rf $STATIC 9.38 -rm -rf $PREFS 9.39 -rm -f $ERROR 9.40 -rm -f out*.tmp 9.41 9.42 mkdir -p "$PREFS/$USER" 9.43 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
10.1 --- a/tests/test_person_non_participation.sh Fri Jan 29 15:31:04 2016 +0100 10.2 +++ b/tests/test_person_non_participation.sh Fri Jan 29 16:44:32 2016 +0100 10.3 @@ -1,40 +1,13 @@ 10.4 #!/bin/sh 10.5 10.6 -THIS_DIR=`dirname $0` 10.7 +. "`dirname \"$0\"`/common.sh" 10.8 10.9 -TEMPLATES="$THIS_DIR/templates" 10.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 10.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 10.12 -STORE=/tmp/store 10.13 -STATIC=/tmp/static 10.14 -PREFS=/tmp/prefs 10.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 10.16 USER="mailto:vincent.vole@example.com" 10.17 IMPOSTER="mailto:oliver.otter@example.com" 10.18 SENDER="mailto:paul.boddie@example.com" 10.19 FBFILE="$STORE/$USER/freebusy" 10.20 FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER" 10.21 FBIMPOSTERFILE="$STORE/$SENDER/freebusy-other/$IMPOSTER" 10.22 -TAB=`printf '\t'` 10.23 - 10.24 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 10.25 - 10.26 -PYTHONPATH="$THIS_DIR/.." 10.27 -export PYTHONPATH 10.28 - 10.29 -ACCEPT_SCRIPT="$THIS_DIR/test_handle.py" 10.30 -ACCEPT_ARGS="accept $STORE $PREFS" 10.31 - 10.32 -DECLINE_SCRIPT="$THIS_DIR/test_handle.py" 10.33 -DECLINE_ARGS="decline $STORE $PREFS" 10.34 - 10.35 -ERROR=err.tmp 10.36 - 10.37 -rm -rf $STORE 10.38 -rm -rf $STATIC 10.39 -rm -rf $PREFS 10.40 -rm -f $ERROR 10.41 -rm -f out*.tmp 10.42 10.43 mkdir -p "$PREFS/$USER" 10.44 echo 'no' > "$PREFS/$USER/participating"
11.1 --- a/tests/test_resource_invitation.sh Fri Jan 29 15:31:04 2016 +0100 11.2 +++ b/tests/test_resource_invitation.sh Fri Jan 29 16:44:32 2016 +0100 11.3 @@ -1,22 +1,8 @@ 11.4 #!/bin/sh 11.5 11.6 -THIS_DIR=`dirname $0` 11.7 +. "`dirname \"$0\"`/common.sh" 11.8 11.9 -TEMPLATES="$THIS_DIR/templates" 11.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 11.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 11.12 -STORE=/tmp/store 11.13 -STATIC=/tmp/static 11.14 -PREFS=/tmp/prefs 11.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 11.16 USER="mailto:resource-room-confroom@example.com" 11.17 -ERROR=err.tmp 11.18 - 11.19 -rm -rf $STORE 11.20 -rm -rf $STATIC 11.21 -rm -rf $PREFS 11.22 -rm -f $ERROR 11.23 -rm -f out*.tmp 11.24 11.25 mkdir -p "$PREFS/$USER" 11.26 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
12.1 --- a/tests/test_resource_invitation_add.sh Fri Jan 29 15:31:04 2016 +0100 12.2 +++ b/tests/test_resource_invitation_add.sh Fri Jan 29 16:44:32 2016 +0100 12.3 @@ -1,31 +1,12 @@ 12.4 #!/bin/sh 12.5 12.6 -THIS_DIR=`dirname $0` 12.7 +. "`dirname \"$0\"`/common.sh" 12.8 12.9 -TEMPLATES="$THIS_DIR/templates" 12.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 12.11 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 12.12 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 12.13 -STORE=/tmp/store 12.14 -STATIC=/tmp/static 12.15 -PREFS=/tmp/prefs 12.16 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 12.17 USER="mailto:resource-room-confroom@example.com" 12.18 SENDER="mailto:paul.boddie@example.com" 12.19 FBFILE="$STORE/$USER/freebusy" 12.20 FBSENDERFILE="$STORE/$SENDER/freebusy" 12.21 FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER" 12.22 -TAB=`printf '\t'` 12.23 - 12.24 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 12.25 - 12.26 -ERROR=err.tmp 12.27 - 12.28 -rm -rf $STORE 12.29 -rm -rf $STATIC 12.30 -rm -rf $PREFS 12.31 -rm -f $ERROR 12.32 -rm -f out*.tmp 12.33 12.34 mkdir -p "$PREFS/$USER" 12.35 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
13.1 --- a/tests/test_resource_invitation_bad.sh Fri Jan 29 15:31:04 2016 +0100 13.2 +++ b/tests/test_resource_invitation_bad.sh Fri Jan 29 16:44:32 2016 +0100 13.3 @@ -1,22 +1,8 @@ 13.4 #!/bin/sh 13.5 13.6 -THIS_DIR=`dirname $0` 13.7 +. "`dirname \"$0\"`/common.sh" 13.8 13.9 -TEMPLATES="$THIS_DIR/templates" 13.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 13.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 13.12 -STORE=/tmp/store 13.13 -STATIC=/tmp/static 13.14 -PREFS=/tmp/prefs 13.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 13.16 USER="mailto:resource-room-confroom@example.com" 13.17 -ERROR=err.tmp 13.18 - 13.19 -rm -rf $STORE 13.20 -rm -rf $STATIC 13.21 -rm -rf $PREFS 13.22 -rm -f $ERROR 13.23 -rm -f out*.tmp 13.24 13.25 mkdir -p "$PREFS/$USER" 13.26 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
14.1 --- a/tests/test_resource_invitation_constraints.sh Fri Jan 29 15:31:04 2016 +0100 14.2 +++ b/tests/test_resource_invitation_constraints.sh Fri Jan 29 16:44:32 2016 +0100 14.3 @@ -1,15 +1,7 @@ 14.4 #!/bin/sh 14.5 14.6 -THIS_DIR=`dirname $0` 14.7 +. "`dirname \"$0\"`/common.sh" 14.8 14.9 -TEMPLATES="$THIS_DIR/templates" 14.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 14.11 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 14.12 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 14.13 -STORE=/tmp/store 14.14 -STATIC=/tmp/static 14.15 -PREFS=/tmp/prefs 14.16 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 14.17 USER="mailto:resource-room-sauna@example.com" 14.18 SENDER="mailto:paul.boddie@example.com" 14.19 RIVALSENDER="mailto:vincent.vole@example.com" 14.20 @@ -19,17 +11,6 @@ 14.21 FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER" 14.22 FBSENDERREQUESTS="$STORE/$SENDER/requests" 14.23 FBRIVALSENDERFILE="$STORE/$RIVALSENDER/freebusy" 14.24 -TAB=`printf '\t'` 14.25 - 14.26 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 14.27 - 14.28 -ERROR=err.tmp 14.29 - 14.30 -rm -rf $STORE 14.31 -rm -rf $STATIC 14.32 -rm -rf $PREFS 14.33 -rm -f $ERROR 14.34 -rm -f out*.tmp 14.35 14.36 mkdir -p "$PREFS/$USER" 14.37 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
15.1 --- a/tests/test_resource_invitation_constraints_alternative.sh Fri Jan 29 15:31:04 2016 +0100 15.2 +++ b/tests/test_resource_invitation_constraints_alternative.sh Fri Jan 29 16:44:32 2016 +0100 15.3 @@ -1,15 +1,7 @@ 15.4 #!/bin/sh 15.5 15.6 -THIS_DIR=`dirname $0` 15.7 +. "`dirname \"$0\"`/common.sh" 15.8 15.9 -TEMPLATES="$THIS_DIR/templates" 15.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 15.11 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 15.12 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 15.13 -STORE=/tmp/store 15.14 -STATIC=/tmp/static 15.15 -PREFS=/tmp/prefs 15.16 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 15.17 USER="mailto:resource-room-sauna@example.com" 15.18 SENDER="mailto:paul.boddie@example.com" 15.19 RIVALSENDER="mailto:vincent.vole@example.com" 15.20 @@ -19,17 +11,6 @@ 15.21 FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER" 15.22 FBSENDERREQUESTS="$STORE/$SENDER/requests" 15.23 FBRIVALSENDERFILE="$STORE/$RIVALSENDER/freebusy" 15.24 -TAB=`printf '\t'` 15.25 - 15.26 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 15.27 - 15.28 -ERROR=err.tmp 15.29 - 15.30 -rm -rf $STORE 15.31 -rm -rf $STATIC 15.32 -rm -rf $PREFS 15.33 -rm -f $ERROR 15.34 -rm -f out*.tmp 15.35 15.36 mkdir -p "$PREFS/$USER" 15.37 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
16.1 --- a/tests/test_resource_invitation_constraints_next_free.sh Fri Jan 29 15:31:04 2016 +0100 16.2 +++ b/tests/test_resource_invitation_constraints_next_free.sh Fri Jan 29 16:44:32 2016 +0100 16.3 @@ -1,15 +1,7 @@ 16.4 #!/bin/sh 16.5 16.6 -THIS_DIR=`dirname $0` 16.7 +. "`dirname \"$0\"`/common.sh" 16.8 16.9 -TEMPLATES="$THIS_DIR/templates" 16.10 -PERSON_SCRIPT="$THIS_DIR/../imip_person.py" 16.11 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 16.12 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 16.13 -STORE=/tmp/store 16.14 -STATIC=/tmp/static 16.15 -PREFS=/tmp/prefs 16.16 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 16.17 USER="mailto:resource-room-sauna@example.com" 16.18 SENDER="mailto:paul.boddie@example.com" 16.19 RIVALSENDER="mailto:vincent.vole@example.com" 16.20 @@ -20,17 +12,6 @@ 16.21 FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER" 16.22 FBSENDERREQUESTS="$STORE/$SENDER/requests" 16.23 FBRIVALSENDERFILE="$STORE/$RIVALSENDER/freebusy" 16.24 -TAB=`printf '\t'` 16.25 - 16.26 -OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py" 16.27 - 16.28 -ERROR=err.tmp 16.29 - 16.30 -rm -rf $STORE 16.31 -rm -rf $STATIC 16.32 -rm -rf $PREFS 16.33 -rm -f $ERROR 16.34 -rm -f out*.tmp 16.35 16.36 mkdir -p "$PREFS/$USER" 16.37 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
17.1 --- a/tests/test_resource_invitation_group.sh Fri Jan 29 15:31:04 2016 +0100 17.2 +++ b/tests/test_resource_invitation_group.sh Fri Jan 29 16:44:32 2016 +0100 17.3 @@ -1,24 +1,9 @@ 17.4 #!/bin/sh 17.5 17.6 -THIS_DIR=`dirname $0` 17.7 +. "`dirname \"$0\"`/common.sh" 17.8 17.9 -TEMPLATES="$THIS_DIR/templates" 17.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 17.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 17.12 -STORE=/tmp/store 17.13 -STATIC=/tmp/static 17.14 -PREFS=/tmp/prefs 17.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 17.16 USER="mailto:resource-room-confroom@example.com" 17.17 17.18 -ERROR=err.tmp 17.19 - 17.20 -rm -rf $STORE 17.21 -rm -rf $STATIC 17.22 -rm -rf $PREFS 17.23 -rm -f $ERROR 17.24 -rm -f out*.tmp 17.25 - 17.26 mkdir -p "$PREFS/$USER" 17.27 echo 'Europe/Oslo' > "$PREFS/$USER/TZID" 17.28 echo 'share' > "$PREFS/$USER/freebusy_sharing"
18.1 --- a/tests/test_resource_invitation_imposter.sh Fri Jan 29 15:31:04 2016 +0100 18.2 +++ b/tests/test_resource_invitation_imposter.sh Fri Jan 29 16:44:32 2016 +0100 18.3 @@ -1,22 +1,8 @@ 18.4 #!/bin/sh 18.5 18.6 -THIS_DIR=`dirname $0` 18.7 +. "`dirname \"$0\"`/common.sh" 18.8 18.9 -TEMPLATES="$THIS_DIR/templates" 18.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 18.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 18.12 -STORE=/tmp/store 18.13 -STATIC=/tmp/static 18.14 -PREFS=/tmp/prefs 18.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 18.16 USER="mailto:resource-room-confroom@example.com" 18.17 -ERROR=err.tmp 18.18 - 18.19 -rm -rf $STORE 18.20 -rm -rf $STATIC 18.21 -rm -rf $PREFS 18.22 -rm -f $ERROR 18.23 -rm -f out*.tmp 18.24 18.25 mkdir -p "$PREFS/$USER" 18.26 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
19.1 --- a/tests/test_resource_invitation_recurring.sh Fri Jan 29 15:31:04 2016 +0100 19.2 +++ b/tests/test_resource_invitation_recurring.sh Fri Jan 29 16:44:32 2016 +0100 19.3 @@ -1,22 +1,8 @@ 19.4 #!/bin/sh 19.5 19.6 -THIS_DIR=`dirname $0` 19.7 +. "`dirname \"$0\"`/common.sh" 19.8 19.9 -TEMPLATES="$THIS_DIR/templates" 19.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 19.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 19.12 -STORE=/tmp/store 19.13 -STATIC=/tmp/static 19.14 -PREFS=/tmp/prefs 19.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 19.16 USER="mailto:resource-room-confroom@example.com" 19.17 -ERROR=err.tmp 19.18 - 19.19 -rm -rf $STORE 19.20 -rm -rf $STATIC 19.21 -rm -rf $PREFS 19.22 -rm -f $ERROR 19.23 -rm -f out*.tmp 19.24 19.25 mkdir -p "$PREFS/$USER" 19.26 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
20.1 --- a/tests/test_resource_invitation_recurring_day.sh Fri Jan 29 15:31:04 2016 +0100 20.2 +++ b/tests/test_resource_invitation_recurring_day.sh Fri Jan 29 16:44:32 2016 +0100 20.3 @@ -1,22 +1,8 @@ 20.4 #!/bin/sh 20.5 20.6 -THIS_DIR=`dirname $0` 20.7 +. "`dirname \"$0\"`/common.sh" 20.8 20.9 -TEMPLATES="$THIS_DIR/templates" 20.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 20.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 20.12 -STORE=/tmp/store 20.13 -STATIC=/tmp/static 20.14 -PREFS=/tmp/prefs 20.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 20.16 USER="mailto:resource-room-confroom@example.com" 20.17 -ERROR=err.tmp 20.18 - 20.19 -rm -rf $STORE 20.20 -rm -rf $STATIC 20.21 -rm -rf $PREFS 20.22 -rm -f $ERROR 20.23 -rm -f out*.tmp 20.24 20.25 mkdir -p "$PREFS/$USER" 20.26 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
21.1 --- a/tests/test_resource_invitation_recurring_indefinitely.sh Fri Jan 29 15:31:04 2016 +0100 21.2 +++ b/tests/test_resource_invitation_recurring_indefinitely.sh Fri Jan 29 16:44:32 2016 +0100 21.3 @@ -1,25 +1,8 @@ 21.4 #!/bin/sh 21.5 21.6 -THIS_DIR=`dirname $0` 21.7 -BASE_DIR="$THIS_DIR/.." 21.8 +. "`dirname \"$0\"`/common.sh" 21.9 21.10 -TEMPLATES="$THIS_DIR/templates" 21.11 -RESOURCE_SCRIPT="$BASE_DIR/imip_resource.py" 21.12 -FREEBUSY_SCRIPT="$BASE_DIR/tools/make_freebusy.py" 21.13 -SHOWMAIL="$BASE_DIR/tools/showmail.py" 21.14 -STORE=/tmp/store 21.15 -STATIC=/tmp/static 21.16 -PREFS=/tmp/prefs 21.17 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 21.18 -FBARGS="-s -n" 21.19 USER="mailto:resource-room-confroom@example.com" 21.20 -ERROR=err.tmp 21.21 - 21.22 -rm -rf $STORE 21.23 -rm -rf $STATIC 21.24 -rm -rf $PREFS 21.25 -rm -f $ERROR 21.26 -rm -f out*.tmp 21.27 21.28 mkdir -p "$PREFS/$USER" 21.29 echo 'Europe/Oslo' > "$PREFS/$USER/TZID" 21.30 @@ -54,7 +37,7 @@ 21.31 && echo "Success" \ 21.32 || echo "Failed" 21.33 21.34 -PYTHONPATH="$BASE_DIR" "$FREEBUSY_SCRIPT" "$USER" $FBARGS $ARGS 2>> $ERROR 21.35 +"$FREEBUSY_SCRIPT" "$USER" $FREEBUSY_ARGS $ARGS 2>> $ERROR 21.36 21.37 grep -q 'event14@example.com' "$STORE/$USER/freebusy-providers" \ 21.38 && echo "Success" \
22.1 --- a/tests/test_resource_invitation_recurring_timezones.sh Fri Jan 29 15:31:04 2016 +0100 22.2 +++ b/tests/test_resource_invitation_recurring_timezones.sh Fri Jan 29 16:44:32 2016 +0100 22.3 @@ -1,22 +1,8 @@ 22.4 #!/bin/sh 22.5 22.6 -THIS_DIR=`dirname $0` 22.7 +. "`dirname \"$0\"`/common.sh" 22.8 22.9 -TEMPLATES="$THIS_DIR/templates" 22.10 -RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py" 22.11 -SHOWMAIL="$THIS_DIR/../tools/showmail.py" 22.12 -STORE=/tmp/store 22.13 -STATIC=/tmp/static 22.14 -PREFS=/tmp/prefs 22.15 -ARGS="-S $STORE -P $STATIC -p $PREFS -d" 22.16 USER="mailto:resource-room-confroom@example.com" 22.17 -ERROR=err.tmp 22.18 - 22.19 -rm -rf $STORE 22.20 -rm -rf $STATIC 22.21 -rm -rf $PREFS 22.22 -rm -f $ERROR 22.23 -rm -f out*.tmp 22.24 22.25 mkdir -p "$PREFS/$USER" 22.26 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"