# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1459712504 -7200
# Node ID ac93d058c7468b7985059f9567e823119d4444c5
# Parent  863601b6e11a52ae3204b0823b986a341f6fb797
Renamed STORETYPE to STORE_TYPE, made psql quiet, renamed the test database.

diff -r 863601b6e11a -r ac93d058c746 tests/common.sh
--- a/tests/common.sh	Fri Apr 01 23:46:45 2016 +0200
+++ b/tests/common.sh	Sun Apr 03 21:41:44 2016 +0200
@@ -3,39 +3,39 @@
 . "`dirname \"$0\"`/common_minimal.sh"
 
 ACCEPT_SCRIPT="$THIS_DIR/test_handle.py"
-ACCEPT_ARGS="accept $STORETYPE $STORE $JOURNAL $PREFS"
+ACCEPT_ARGS="accept $STORE_TYPE $STORE $JOURNAL $PREFS"
 
 COUNTER_SCRIPT="$THIS_DIR/test_handle.py"
-COUNTER_ARGS="counter $STORETYPE $STORE $JOURNAL $PREFS"
+COUNTER_ARGS="counter $STORE_TYPE $STORE $JOURNAL $PREFS"
 
 DECLINE_SCRIPT="$THIS_DIR/test_handle.py"
-DECLINE_ARGS="decline $STORETYPE $STORE $JOURNAL $PREFS"
+DECLINE_ARGS="decline $STORE_TYPE $STORE $JOURNAL $PREFS"
 
 FREEBUSY_SCRIPT="$BASE_DIR/tools/make_freebusy.py"
 FREEBUSY_ARGS="-s -n"
 
 LIST_SCRIPT="$THIS_DIR/list_table.py"
-LIST_ARGS="$STORETYPE $STORE $JOURNAL"
+LIST_ARGS="$STORE_TYPE $STORE $JOURNAL"
 
 OUTGOING_SCRIPT="$BASE_DIR/imip_person_outgoing.py"
 
 PERSON_SCRIPT="$BASE_DIR/imip_person.py"
 
 SET_QUOTA_LIMIT="$BASE_DIR/tools/set_quota_limit.py"
-SET_QUOTA_LIMIT_ARGS="-T $STORETYPE -j $JOURNAL" 
+SET_QUOTA_LIMIT_ARGS="-T $STORE_TYPE -j $JOURNAL" 
 
 TAB=`printf '\t'`
 
 PYTHONPATH="$BASE_DIR"
 export PYTHONPATH
 
-if [ "$STORETYPE" = "file" ]; then
+if [ "$STORE_TYPE" = "file" ]; then
     rm -rf "$STORE"
     rm -rf "$JOURNAL"
-elif [ "$STORETYPE" = "postgresql" ]; then
+elif [ "$STORE_TYPE" = "postgresql" ]; then
     dropdb "$DBNAME"
     createdb "$DBNAME"
-    psql -f "$BASE_DIR/conf/postgresql/schema.sql" "$DBNAME"
+    psql -q -f "$BASE_DIR/conf/postgresql/schema.sql" "$DBNAME"
 fi
 
 rm -rf "$STATIC"
diff -r 863601b6e11a -r ac93d058c746 tests/common_minimal.sh
--- a/tests/common_minimal.sh	Fri Apr 01 23:46:45 2016 +0200
+++ b/tests/common_minimal.sh	Sun Apr 03 21:41:44 2016 +0200
@@ -3,13 +3,13 @@
 THIS_DIR=`dirname "$0"`
 BASE_DIR="$THIS_DIR/.."
 
-STORETYPE=${STORETYPE:-file}
+STORE_TYPE=${STORE_TYPE:-file}
 
-if [ "$STORETYPE" = "file" ]; then
+if [ "$STORE_TYPE" = "file" ]; then
     STORE=/tmp/store
     JOURNAL=/tmp/journal
-elif [ "$STORETYPE" = "postgresql" ]; then
-    DBNAME='test'
+elif [ "$STORE_TYPE" = "postgresql" ]; then
+    DBNAME='imip_agent_test'
     STORE="dbname=$DBNAME"
     JOURNAL="$STORE"
 fi
@@ -17,7 +17,7 @@
 STATIC=/tmp/static
 PREFS=/tmp/prefs
 
-ARGS="-T $STORETYPE -S $STORE -P $STATIC -p $PREFS -j $JOURNAL -d"
+ARGS="-T $STORE_TYPE -S $STORE -P $STATIC -p $PREFS -j $JOURNAL -d"
 
 RESOURCE_SCRIPT="$BASE_DIR/imip_resource.py"