Merge branch 'exim-4.96+security' into master+security

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

diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index a96b719308a1f5b67f4073788978d1bd6556d8b7..bad032b30f99afebfd5b728accfd802c7f6f29ff 100644 (file)
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -8,16 +8,21 @@ echo Starting DB server
 perl
 system 'DIR/bin.sys/initdb -D DIR/pgsql/data';
 ****
 perl
 system 'DIR/bin.sys/initdb -D DIR/pgsql/data';
 ****

-sudo rm test-stdout
+#
+# I don not understand why, but the DB fails to start if this rm is present.
+#sudo rm test-stdout
+#
+# Start the DB server

 background
 DIR/bin.sys/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql
 ****
 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';
 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 \
+system 'DIR/bin.sys/psql -h localhost -p PORT_N -d test \

  -c "CREATE TABLE them ( name text, id text ); \
      INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' ); \
      INSERT INTO them VALUES ( \'Aristotle\',    \'aaaa\' ); \
  -c "CREATE TABLE them ( name text, id text ); \
      INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' ); \
      INSERT INTO them VALUES ( \'Aristotle\',    \'aaaa\' ); \


@@ -28,6 +33,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
 echo Populated DB server
 #
 # now, the tests


@@ -52,6 +58,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
 ${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>
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>