X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ff0592132f7e1f9b871a1afb4aa23da96dc189f8..2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2:/test/scripts/2620-Postgresql/2620

diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index 1f8f3abe1..5d160774d 100644
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -4,6 +4,7 @@
 #
 # first, populate a DB to test against
 sudo rm -fr DIR/pgsql
+echo Starting DB server
 perl
 system 'DIR/bin.sys/initdb -D DIR/pgsql/data';
 ****
@@ -12,7 +13,9 @@ background
 DIR/bin.sys/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
 sleep 1
+echo Waiting for DB server
 perl
+system 'DIR/bin.sys/pg_ctl -w -D DIR/pgsql/data status';
 system 'createdb -h localhost -p PORT_N test';
 system 'psql -h localhost -p PORT_N -d test \
  -c "CREATE TABLE them ( name text, id text ); \
@@ -25,6 +28,7 @@ system 'psql -h localhost -p PORT_N -d test \
      INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
  ';
 ****
+echo Populated DB server
 #
 # now, the tests
 exim -d-all+lookup -be
@@ -48,6 +52,7 @@ ${lookup pgsql {SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');}}
 ${lookup pgsql {delete from them where id='aaaa'}}
 ****
 exim -d -bh 10.0.0.0
+helo test
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
@@ -62,7 +67,8 @@ ${lookup pgsql {select name from them where id='ph10';}}
 ****
 #
 perl
-system 'pg_ctl stop -D DIR/pgsql/data -m immediate';
+system 'DIR/bin.sys/pg_ctl stop -D DIR/pgsql/data -m immediate';
 ****
+sleep 2
 killdaemon
 sudo rm -fr DIR/pgsql