Fix spurious detection of timeout while writing to transport filter

[users/jgh/exim.git] / test / scripts / 2620-Postgresql / 2620

diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index d0dd0019028395bf943747939da0056e2557ebc6..a96b719308a1f5b67f4073788978d1bd6556d8b7 100644 (file)
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -1,7 +1,10 @@
 # pgsql lookups
 # pgsql lookups

+# The pgsql-devel (or equivalent) package will be need for Exim to build, and
+# the postgresql-server (or equivalent) package for this test to run.

 #
 # first, populate a DB to test against
 sudo rm -fr DIR/pgsql
 #
 # 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';
 ****
 perl
 system 'DIR/bin.sys/initdb -D DIR/pgsql/data';
 ****


@@ -10,7 +13,9 @@ background
 DIR/bin.sys/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
 sleep 1
 DIR/bin.sys/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
 sleep 1

+echo Waiting for DB server

 perl
 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 ); \
 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 ); \


@@ -23,6 +28,7 @@ system 'psql -h localhost -p PORT_N -d test \
      INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
  ';
 ****
      INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \
  ';
 ****

+echo Populated DB server

 #
 # now, the tests
 exim -d-all+lookup -be
 #
 # now, the tests
 exim -d-all+lookup -be


@@ -43,6 +49,7 @@ ${lookup pgsql {servers=(DIR/pgsql/.s.PGSQL.PORT_N)/test/CALLER/:x; select name
 x
 ${lookup pgsql {SELECT name FROM them WHERE id IN ('ph10', 'aaaa');}}
 ${lookup pgsql {SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');}}
 x
 ${lookup pgsql {SELECT name FROM them WHERE id IN ('ph10', 'aaaa');}}
 ${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
 mail from:<a@b>
 ****
 exim -d -bh 10.0.0.0
 mail from:<a@b>


@@ -59,7 +66,8 @@ ${lookup pgsql {select name from them where id='ph10';}}
 ****
 #
 perl
 ****
 #
 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
 killdaemon
 sudo rm -fr DIR/pgsql