1.1 --- a/tests/test_resource_invitation_recurring_indefinitely.sh Fri Jan 29 15:31:04 2016 +0100
1.2 +++ b/tests/test_resource_invitation_recurring_indefinitely.sh Fri Jan 29 16:44:32 2016 +0100
1.3 @@ -1,25 +1,8 @@
1.4 #!/bin/sh
1.5
1.6 -THIS_DIR=`dirname $0`
1.7 -BASE_DIR="$THIS_DIR/.."
1.8 +. "`dirname \"$0\"`/common.sh"
1.9
1.10 -TEMPLATES="$THIS_DIR/templates"
1.11 -RESOURCE_SCRIPT="$BASE_DIR/imip_resource.py"
1.12 -FREEBUSY_SCRIPT="$BASE_DIR/tools/make_freebusy.py"
1.13 -SHOWMAIL="$BASE_DIR/tools/showmail.py"
1.14 -STORE=/tmp/store
1.15 -STATIC=/tmp/static
1.16 -PREFS=/tmp/prefs
1.17 -ARGS="-S $STORE -P $STATIC -p $PREFS -d"
1.18 -FBARGS="-s -n"
1.19 USER="mailto:resource-room-confroom@example.com"
1.20 -ERROR=err.tmp
1.21 -
1.22 -rm -rf $STORE
1.23 -rm -rf $STATIC
1.24 -rm -rf $PREFS
1.25 -rm -f $ERROR
1.26 -rm -f out*.tmp
1.27
1.28 mkdir -p "$PREFS/$USER"
1.29 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
1.30 @@ -54,7 +37,7 @@
1.31 && echo "Success" \
1.32 || echo "Failed"
1.33
1.34 -PYTHONPATH="$BASE_DIR" "$FREEBUSY_SCRIPT" "$USER" $FBARGS $ARGS 2>> $ERROR
1.35 +"$FREEBUSY_SCRIPT" "$USER" $FREEBUSY_ARGS $ARGS 2>> $ERROR
1.36
1.37 grep -q 'event14@example.com' "$STORE/$USER/freebusy-providers" \
1.38 && echo "Success" \