1.1 --- a/tests/common.sh Fri Apr 01 23:46:45 2016 +0200
1.2 +++ b/tests/common.sh Sun Apr 03 21:41:44 2016 +0200
1.3 @@ -3,39 +3,39 @@
1.4 . "`dirname \"$0\"`/common_minimal.sh"
1.5
1.6 ACCEPT_SCRIPT="$THIS_DIR/test_handle.py"
1.7 -ACCEPT_ARGS="accept $STORETYPE $STORE $JOURNAL $PREFS"
1.8 +ACCEPT_ARGS="accept $STORE_TYPE $STORE $JOURNAL $PREFS"
1.9
1.10 COUNTER_SCRIPT="$THIS_DIR/test_handle.py"
1.11 -COUNTER_ARGS="counter $STORETYPE $STORE $JOURNAL $PREFS"
1.12 +COUNTER_ARGS="counter $STORE_TYPE $STORE $JOURNAL $PREFS"
1.13
1.14 DECLINE_SCRIPT="$THIS_DIR/test_handle.py"
1.15 -DECLINE_ARGS="decline $STORETYPE $STORE $JOURNAL $PREFS"
1.16 +DECLINE_ARGS="decline $STORE_TYPE $STORE $JOURNAL $PREFS"
1.17
1.18 FREEBUSY_SCRIPT="$BASE_DIR/tools/make_freebusy.py"
1.19 FREEBUSY_ARGS="-s -n"
1.20
1.21 LIST_SCRIPT="$THIS_DIR/list_table.py"
1.22 -LIST_ARGS="$STORETYPE $STORE $JOURNAL"
1.23 +LIST_ARGS="$STORE_TYPE $STORE $JOURNAL"
1.24
1.25 OUTGOING_SCRIPT="$BASE_DIR/imip_person_outgoing.py"
1.26
1.27 PERSON_SCRIPT="$BASE_DIR/imip_person.py"
1.28
1.29 SET_QUOTA_LIMIT="$BASE_DIR/tools/set_quota_limit.py"
1.30 -SET_QUOTA_LIMIT_ARGS="-T $STORETYPE -j $JOURNAL"
1.31 +SET_QUOTA_LIMIT_ARGS="-T $STORE_TYPE -j $JOURNAL"
1.32
1.33 TAB=`printf '\t'`
1.34
1.35 PYTHONPATH="$BASE_DIR"
1.36 export PYTHONPATH
1.37
1.38 -if [ "$STORETYPE" = "file" ]; then
1.39 +if [ "$STORE_TYPE" = "file" ]; then
1.40 rm -rf "$STORE"
1.41 rm -rf "$JOURNAL"
1.42 -elif [ "$STORETYPE" = "postgresql" ]; then
1.43 +elif [ "$STORE_TYPE" = "postgresql" ]; then
1.44 dropdb "$DBNAME"
1.45 createdb "$DBNAME"
1.46 - psql -f "$BASE_DIR/conf/postgresql/schema.sql" "$DBNAME"
1.47 + psql -q -f "$BASE_DIR/conf/postgresql/schema.sql" "$DBNAME"
1.48 fi
1.49
1.50 rm -rf "$STATIC"
2.1 --- a/tests/common_minimal.sh Fri Apr 01 23:46:45 2016 +0200
2.2 +++ b/tests/common_minimal.sh Sun Apr 03 21:41:44 2016 +0200
2.3 @@ -3,13 +3,13 @@
2.4 THIS_DIR=`dirname "$0"`
2.5 BASE_DIR="$THIS_DIR/.."
2.6
2.7 -STORETYPE=${STORETYPE:-file}
2.8 +STORE_TYPE=${STORE_TYPE:-file}
2.9
2.10 -if [ "$STORETYPE" = "file" ]; then
2.11 +if [ "$STORE_TYPE" = "file" ]; then
2.12 STORE=/tmp/store
2.13 JOURNAL=/tmp/journal
2.14 -elif [ "$STORETYPE" = "postgresql" ]; then
2.15 - DBNAME='test'
2.16 +elif [ "$STORE_TYPE" = "postgresql" ]; then
2.17 + DBNAME='imip_agent_test'
2.18 STORE="dbname=$DBNAME"
2.19 JOURNAL="$STORE"
2.20 fi
2.21 @@ -17,7 +17,7 @@
2.22 STATIC=/tmp/static
2.23 PREFS=/tmp/prefs
2.24
2.25 -ARGS="-T $STORETYPE -S $STORE -P $STATIC -p $PREFS -j $JOURNAL -d"
2.26 +ARGS="-T $STORE_TYPE -S $STORE -P $STATIC -p $PREFS -j $JOURNAL -d"
2.27
2.28 RESOURCE_SCRIPT="$BASE_DIR/imip_resource.py"
2.29