From 298849d8ea217fd104d167f5233bd11240b3ddae Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 1 Apr 2020 23:29:40 +0100 Subject: Sqlite: new main option sqlite_dbfile --- test/confs/2600 | 3 +++ test/scripts/2600-SQLite/2600 | 5 +++++ test/stderr/2600 | 34 ++++++++++++++++++++++++---------- test/stdout/2600 | 2 ++ 4 files changed, 34 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/confs/2600 b/test/confs/2600 index 566e260f2..e42cbe33c 100644 --- a/test/confs/2600 +++ b/test/confs/2600 @@ -14,6 +14,9 @@ hostlist relay_hosts = sqlite;DIR/aux-fixed/sqlitedb \ acl_smtp_rcpt = check_recipient sqlite_lock_timeout = 2 +.ifdef DATA +sqlite_dbfile = DATA +.endif # ----- ACL ----- diff --git a/test/scripts/2600-SQLite/2600 b/test/scripts/2600-SQLite/2600 index f388b1ac1..2a557a46a 100644 --- a/test/scripts/2600-SQLite/2600 +++ b/test/scripts/2600-SQLite/2600 @@ -30,3 +30,8 @@ Test message exim -d-all+lookup -be ${lookup sqlite{DIR/aux-fixed/sqlitedb select name from them where id='userx';}} **** +# +# +exim -DDATA=DIR/aux-fixed/sqlitedb -d-all+lookup -be +${lookup sqlite{select name from them where id='userx';}} +**** diff --git a/test/stderr/2600 b/test/stderr/2600 index 15e9bb540..69e23f848 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -137,12 +137,12 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -157,7 +157,7 @@ lookup failed host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list) host in "+relay_hosts"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "deny" (TESTSUITE/test-config 25) +processing "deny" (TESTSUITE/test-config 28) message: relay not permitted deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY @@ -166,12 +166,12 @@ LOG: MAIN REJECT H=[10.0.0.0] F= rejected RCPT : relay not permitted SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open @@ -187,7 +187,7 @@ lookup failed host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list) host in "+relay_hosts"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "deny" (TESTSUITE/test-config 25) +processing "deny" (TESTSUITE/test-config 28) message: relay not permitted deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY @@ -232,12 +232,12 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -256,12 +256,12 @@ SMTP>> 250 Accepted DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open @@ -489,3 +489,17 @@ dropping to exim gid; retaining priv uid lookup yielded: Ayen Other search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid + search_open: sqlite "NULL" + search_find: file="NULL" + key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 + LRU list: + internal_search_find: file="NULL" + type=sqlite key="select name from them where id='userx';" + database lookup required for select name from them where id='userx'; + lookup yielded: Ayen Other +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stdout/2600 b/test/stdout/2600 index 2b11b92df..53d6b9b23 100644 --- a/test/stdout/2600 +++ b/test/stdout/2600 @@ -32,3 +32,5 @@ after" id=newline 221 myhost.test.ex closing connection > Ayen Other > +> Ayen Other +> -- cgit v1.2.3