summaryrefslogtreecommitdiffstats
path: root/test/testrun_2d.sh
diff options
context:
space:
mode:
Diffstat (limited to 'test/testrun_2d.sh')
-rwxr-xr-xtest/testrun_2d.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/test/testrun_2d.sh b/test/testrun_2d.sh
index bfdcb1a..b457753 100755
--- a/test/testrun_2d.sh
+++ b/test/testrun_2d.sh
@@ -37,11 +37,11 @@ check_psql_log () {
rm -f test_log_db
# PGPASSWORD=samhain; export PGPASSWORD
create_pgpass
- psql -o test_log_db -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';"
+ psql -h localhost -o test_log_db -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';"
#
egrep "START.*Yule" test_log_db >/dev/null 2>&1
if [ $? -ne 0 ]; then
- [ -z "$verbose" ] || log_msg_fail "Server start (psql)";
+ [ -z "$verbose" ] || log_msg_fail "Server start (psql) DATE ${DATE}";
return 1
fi
egrep "NEW CLIENT" test_log_db >/dev/null 2>&1
@@ -87,7 +87,7 @@ testrun2d ()
else
# PGPASSWORD="samhain"; export PGPASSWORD
create_pgpass
- TEST=`psql -U samhain -d samhain -c "SELECT * FROM log LIMIT 1;" 2>/dev/null`
+ TEST=`psql -h localhost -U samhain -d samhain -c "SELECT * FROM log LIMIT 1;" 2>/dev/null`
if [ $? -ne 0 -o -z "$TEST" ]; then
log_skip 1 $MAXTEST "psql not default setup"
return 1
@@ -116,6 +116,13 @@ EOF
wq
EOF
#
+ ORIGINAL="# setdbname=samhain"
+ REPLACEMENT="setdbhost=127.0.0.1"
+ ex -s $RCFILE <<EOF
+%s/$ORIGINAL/$REPLACEMENT/g
+wq
+EOF
+ #
do_test_1_a
#
if [ $? -ne 0 ]; then