From cd20567258f6e63e21d2e42233869e7574e3a312 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 18 Aug 2018 22:10:42 +0200 Subject: [PATCH] Fix psql invocation in tests similar to 4f48ae3c7c7a3ae7aab4594420b0646ae27d4c7d, but for the ssl tests --- test/ssl/test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/ssl/test.sh b/test/ssl/test.sh index 815065a..a86d3bf 100755 --- a/test/ssl/test.sh +++ b/test/ssl/test.sh @@ -69,8 +69,8 @@ pgctl start sleep 5 echo "createdb" -psql -p $PG_PORT -l | grep p0 > /dev/null || { - psql -p $PG_PORT -c "create user bouncer" template1 +psql -X -p $PG_PORT -l | grep p0 > /dev/null || { + psql -X -o /dev/null -p $PG_PORT -c "create user bouncer" template1 createdb -p $PG_PORT p0 createdb -p $PG_PORT p1 } @@ -120,7 +120,7 @@ die() { } admin() { - psql -h /tmp -U pgbouncer pgbouncer -c "$@;" || die "Cannot contact bouncer!" + psql -X -h /tmp -U pgbouncer pgbouncer -c "$@;" || die "Cannot contact bouncer!" } runtest() { @@ -140,11 +140,11 @@ runtest() { } psql_pg() { - psql -U bouncer -h 127.0.0.1 -p $PG_PORT "$@" + psql -X -U bouncer -h 127.0.0.1 -p $PG_PORT "$@" } psql_bouncer() { - PGUSER=bouncer psql "$@" + PGUSER=bouncer psql -X "$@" } # server_lifetime -- 2.40.0