From 0972d4d7f8213f61a2181c65a94ffd97eaf381b9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 24 Dec 2017 20:46:56 +0000 Subject: Testsuite: shift pgsql tests to the standard-run set --- test/scripts/2620-Postgresql/2620 | 59 +++++++++++++++++++++++++++++++++++ test/scripts/2620-Postgresql/REQUIRES | 1 + test/scripts/9200-PostgreSQL/9200 | 59 ----------------------------------- 3 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 test/scripts/2620-Postgresql/2620 create mode 100644 test/scripts/2620-Postgresql/REQUIRES delete mode 100644 test/scripts/9200-PostgreSQL/9200 (limited to 'test/scripts') diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620 new file mode 100644 index 000000000..62ee31354 --- /dev/null +++ b/test/scripts/2620-Postgresql/2620 @@ -0,0 +1,59 @@ +# pgsql lookups +# +# first, populate a DB to test against +sudo rm -fr DIR/pgsql +perl +system 'initdb -D DIR/pgsql/data'; +**** +background +/usr/bin/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql +**** +perl +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 );" \ + -c "INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' );" \ + -c "INSERT INTO them VALUES ( \'\', \'nothing\' );" \ + -c "INSERT INTO them VALUES ( \'\"stquot\', \'quote2\' );" \ + -c "INSERT INTO them VALUES ( \'before\' || CHR(13) || CHR(10) || \'after\', \'newline\' );" \ + -c "INSERT INTO them VALUES ( \'x\' || CHR(9) || \'x\', \'tab\' );" \ + -c "INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \ + '; +**** +# +# now, the tests +exim -d-all+lookup -be +${lookup pgsql {select name from them where id='ph10';}} +${lookup pgsql {select name from them where id='ph10';}} +${lookup pgsql {select name from them where id='xxxx';}} +${lookup pgsql {select name from them where id='nothing';}} +${lookup pgsql {select id,name from them where id='nothing';}} +${lookup pgsql {delete from them where id='nonexist';}} +${lookup pgsql {select * from them where id='quote2';}} +${lookup pgsql {select * from them where id='newline';}} +${lookup pgsql {select * from them where id='tab';}} +${lookup pgsql {select * from them where name='${quote_pgsql:'stquot}';}} +${lookup pgsql {servers=x:localhost; select name from them where id='ph10';}} +${lookup pgsql {servers=localhost::PORT_N:x; select name from them where id='ph10';}} +${lookup pgsql {servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';}} +${lookup pgsql {servers=(DIR/pgsql/.s.PGSQL.PORT_N)/test/CALLER/:x; select name from them where id='ph10';}} +**** +exim -d -bh 10.0.0.0 +mail from: +rcpt to: +rcpt to: +quit +**** +exim -odi -d CALLER +Test message +. +**** +exim -DSERVERS=\(DIR/pgsql/.s.PGSQL.PORT_N\)/test/CALLER/ -d-all+lookup -be +${lookup pgsql {select name from them where id='ph10';}} +**** +# +perl +system 'pg_ctl stop -D DIR/pgsql/data -m immediate'; +**** +killdaemon +sudo rm -fr DIR/pgsql diff --git a/test/scripts/2620-Postgresql/REQUIRES b/test/scripts/2620-Postgresql/REQUIRES new file mode 100644 index 000000000..5303be6ca --- /dev/null +++ b/test/scripts/2620-Postgresql/REQUIRES @@ -0,0 +1 @@ +lookup pgsql diff --git a/test/scripts/9200-PostgreSQL/9200 b/test/scripts/9200-PostgreSQL/9200 deleted file mode 100644 index 62ee31354..000000000 --- a/test/scripts/9200-PostgreSQL/9200 +++ /dev/null @@ -1,59 +0,0 @@ -# pgsql lookups -# -# first, populate a DB to test against -sudo rm -fr DIR/pgsql -perl -system 'initdb -D DIR/pgsql/data'; -**** -background -/usr/bin/postgres -D DIR/pgsql/data -p PORT_N -k DIR/pgsql -**** -perl -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 );" \ - -c "INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' );" \ - -c "INSERT INTO them VALUES ( \'\', \'nothing\' );" \ - -c "INSERT INTO them VALUES ( \'\"stquot\', \'quote2\' );" \ - -c "INSERT INTO them VALUES ( \'before\' || CHR(13) || CHR(10) || \'after\', \'newline\' );" \ - -c "INSERT INTO them VALUES ( \'x\' || CHR(9) || \'x\', \'tab\' );" \ - -c "INSERT INTO them VALUES ( CHR(39) || \'stquot\', \'quote1\' );" \ - '; -**** -# -# now, the tests -exim -d-all+lookup -be -${lookup pgsql {select name from them where id='ph10';}} -${lookup pgsql {select name from them where id='ph10';}} -${lookup pgsql {select name from them where id='xxxx';}} -${lookup pgsql {select name from them where id='nothing';}} -${lookup pgsql {select id,name from them where id='nothing';}} -${lookup pgsql {delete from them where id='nonexist';}} -${lookup pgsql {select * from them where id='quote2';}} -${lookup pgsql {select * from them where id='newline';}} -${lookup pgsql {select * from them where id='tab';}} -${lookup pgsql {select * from them where name='${quote_pgsql:'stquot}';}} -${lookup pgsql {servers=x:localhost; select name from them where id='ph10';}} -${lookup pgsql {servers=localhost::PORT_N:x; select name from them where id='ph10';}} -${lookup pgsql {servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';}} -${lookup pgsql {servers=(DIR/pgsql/.s.PGSQL.PORT_N)/test/CALLER/:x; select name from them where id='ph10';}} -**** -exim -d -bh 10.0.0.0 -mail from: -rcpt to: -rcpt to: -quit -**** -exim -odi -d CALLER -Test message -. -**** -exim -DSERVERS=\(DIR/pgsql/.s.PGSQL.PORT_N\)/test/CALLER/ -d-all+lookup -be -${lookup pgsql {select name from them where id='ph10';}} -**** -# -perl -system 'pg_ctl stop -D DIR/pgsql/data -m immediate'; -**** -killdaemon -sudo rm -fr DIR/pgsql -- cgit v1.2.3