diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/aux-fixed/2500.dir/regfile | 0 | ||||
| -rw-r--r-- | test/scripts/2500-dsearch/2500 | 9 | ||||
| -rw-r--r-- | test/stderr/2200 | 2 | ||||
| -rw-r--r-- | test/stderr/2201 | 2 | ||||
| -rw-r--r-- | test/stderr/2600 | 4 | ||||
| -rw-r--r-- | test/stdout/2500 | 7 |
6 files changed, 19 insertions, 5 deletions
diff --git a/test/aux-fixed/2500.dir/regfile b/test/aux-fixed/2500.dir/regfile new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test/aux-fixed/2500.dir/regfile diff --git a/test/scripts/2500-dsearch/2500 b/test/scripts/2500-dsearch/2500 index 14cf31b26..588690373 100644 --- a/test/scripts/2500-dsearch/2500 +++ b/test/scripts/2500-dsearch/2500 @@ -7,7 +7,14 @@ fail: ${lookup{TESTNUM.tst} dsearch{DIR/dir_not_here}{$value}{FAIL}} fail(case): ${lookup{TESTNUM.TST} dsearch{DIR/aux-fixed}{$value}{FAIL}} fail(case): ${lookup{TESTNUM.TST} dsearch{DIR/AUX-fixed}{$value}{FAIL}} fail(path): ${lookup{TESTNUM.tst} dsearch{.}{$value}{OTHER}} -ok,full: ${lookup{TESTNUM.tst} dsearch,ret=full {DIR/aux-fixed}{$value}{FAIL}} +ok,full: ${lookup{TESTNUM.tst} dsearch,ret=full {DIR/aux-fixed}{$value}{FAIL}} +ok,file: ${lookup{TESTNUM.tst} dsearch,filter=file {DIR/aux-fixed}{$value}{FAIL}} +fail,file: ${lookup{TESTNUM.dir} dsearch,filter=file {DIR/aux-fixed}{$value}{FAIL}} +ok,dir: ${lookup{TESTNUM.dir} dsearch,filter=dir {DIR/aux-fixed}{$value}{FAIL}} +fail,dir: ${lookup{TESTNUM.tst} dsearch,filter=dir {DIR/aux-fixed}{$value}{FAIL}} +ok,subdir: ${lookup{TESTNUM.dir} dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}} +fail,subdir:${lookup{..} dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}} +fail,subdir:${lookup{TESTNUM.tst} dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}} **** # 1 diff --git a/test/stderr/2200 b/test/stderr/2200 index 8efc38f64..c8320321a 100644 --- a/test/stderr/2200 +++ b/test/stderr/2200 @@ -43,7 +43,7 @@ search_tidyup called LRU list: internal_search_find: file="NULL" type=dnsdb key="a=shorthost.test.ex" opts=NULL - cached data found but past valid time; database lookup required for a=shorthost.test.ex + cached data found but either wrong opts or dated; database lookup required for a=shorthost.test.ex dnsdb key: shorthost.test.ex lookup yielded: 127.0.0.1 LOG: MAIN diff --git a/test/stderr/2201 b/test/stderr/2201 index 9764069d8..fb618fc64 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -176,7 +176,7 @@ search_find: file="NULL" LRU list: internal_search_find: file="NULL" type=dnsdb key="a=shorthost.test.ex" opts=NULL -cached data found but past valid time; database lookup required for a=shorthost.test.ex +cached data found but either wrong opts or dated; database lookup required for a=shorthost.test.ex dnsdb key: shorthost.test.ex lookup yielded: 127.0.0.1 LOG: MAIN diff --git a/test/stderr/2600 b/test/stderr/2600 index 3c4a59271..627e47755 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -495,10 +495,10 @@ 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 + key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=sqlite key="select name from them where id='userx';" + type=sqlite key="select name from them where id='userx';" opts=NULL database lookup required for select name from them where id='userx'; lookup yielded: Ayen Other search_tidyup called diff --git a/test/stdout/2500 b/test/stdout/2500 index d10a5f8a7..ef5b2a18c 100644 --- a/test/stdout/2500 +++ b/test/stdout/2500 @@ -5,4 +5,11 @@ > Failed: failed to open TESTSUITE/AUX-fixed for directory search: No such file or directory > Failed: dirname '.' for dsearch is not absolute > ok,full: TESTSUITE/aux-fixed/2500.tst +> ok,file: 2500.tst +> fail,file: FAIL +> ok,dir: 2500.dir +> fail,dir: FAIL +> ok,subdir: 2500.dir +> fail,subdir:FAIL +> fail,subdir:FAIL > |