1.1 --- a/tests/common.sh Thu Mar 10 01:43:31 2016 +0100
1.2 +++ b/tests/common.sh Fri Mar 11 01:33:45 2016 +0100
1.3 @@ -1,23 +1,6 @@
1.4 #!/bin/sh
1.5
1.6 -THIS_DIR=`dirname "$0"`
1.7 -BASE_DIR="$THIS_DIR/.."
1.8 -
1.9 -STORETYPE=file
1.10 -
1.11 -if [ "$STORETYPE" = "file" ]; then
1.12 - STORE=/tmp/store
1.13 - JOURNAL=/tmp/journal
1.14 -elif [ "$STORETYPE" = "postgresql" ]; then
1.15 - DBNAME='test'
1.16 - STORE="dbname=$DBNAME"
1.17 - JOURNAL="$STORE"
1.18 -fi
1.19 -
1.20 -STATIC=/tmp/static
1.21 -PREFS=/tmp/prefs
1.22 -
1.23 -ARGS="-T $STORETYPE -S $STORE -P $STATIC -p $PREFS -j $JOURNAL -d"
1.24 +. "`dirname \"$0\"`/common_minimal.sh"
1.25
1.26 ACCEPT_SCRIPT="$THIS_DIR/test_handle.py"
1.27 ACCEPT_ARGS="accept $STORETYPE $STORE $JOURNAL $PREFS"
1.28 @@ -38,16 +21,11 @@
1.29
1.30 PERSON_SCRIPT="$BASE_DIR/imip_person.py"
1.31
1.32 -RESOURCE_SCRIPT="$BASE_DIR/imip_resource.py"
1.33 -
1.34 -SHOWMAIL="$BASE_DIR/tools/showmail.py"
1.35 +SET_QUOTA_LIMIT="$BASE_DIR/tools/set_quota_limit.py"
1.36 +SET_QUOTA_LIMIT_ARGS="-T $STORETYPE -j $JOURNAL"
1.37
1.38 TAB=`printf '\t'`
1.39
1.40 -TEMPLATES="$THIS_DIR/templates"
1.41 -
1.42 -ERROR=err.tmp
1.43 -
1.44 PYTHONPATH="$BASE_DIR"
1.45 export PYTHONPATH
1.46