diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-07-13 14:46:05 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-07-13 14:46:05 +0000 |
| commit | 5dff5817bb92191e4fd5f9d36fe20b1fec6c9969 (patch) | |
| tree | e4fe0c000eae3f0c9db8952c215799f008701155 /test | |
| parent | a5bd321b2f16ff323e3e268d59606e89b747a901 (diff) | |
Add a check for Auto-Submitted to the default for
delay_warning_condition.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0098 | 3 | ||||
| -rw-r--r-- | test/log/0098 | 14 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0098 | 20 | ||||
| -rw-r--r-- | test/stdout/0098 | 2 |
4 files changed, 39 insertions, 0 deletions
diff --git a/test/confs/0098 b/test/confs/0098 index deec607e9..07346c87e 100644 --- a/test/confs/0098 +++ b/test/confs/0098 @@ -17,7 +17,10 @@ qualify_domain = test.ex domainlist local_domains = test.ex : another.test.ex delay_warning = 10s:40s:10m + +.ifndef DEFAULTDWC delay_warning_condition = ${if !eq{$domain}{another.test.ex}{yes}{no}} +.endif log_selector = +subject diff --git a/test/log/0098 b/test/log/0098 index 98e22e3a1..5e0c1da7f 100644 --- a/test/log/0098 +++ b/test/log/0098 @@ -89,3 +89,17 @@ 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmbI-0005vi-00 == defer@another.test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbI-0005vi-00 removed by CALLER +1999-03-02 09:44:33 10HmbI-0005vi-00 Completed +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbJ-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbJ-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbJ-0005vi-00 removed by CALLER +1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. +1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/scripts/0000-Basic/0098 b/test/scripts/0000-Basic/0098 index 18f348718..08a981f09 100644 --- a/test/scripts/0000-Basic/0098 +++ b/test/scripts/0000-Basic/0098 @@ -38,4 +38,24 @@ Testing **** exim -Tqt 20s/ -odi -qf **** +# Remove the previous message +exim -Mrm $msg1 +**** +# Check no warnings for Precedence: list (in default config) +exim -odi defer@test.ex +Precedence: list +Test message +**** +exim -DDEFAULTDWC -Tqt 20s/ -odi -qf +**** +# Remove the previous message +exim -Mrm $msg1 +**** +# Check no warnings for Auto-Submitted: auto-generated (in default config) +exim -odi defer@test.ex +Auto-Submitted: auto-generated +Test message +**** +exim -DDEFAULTDWC -Tqt 20s/ -odi -qf +**** no_msglog_check diff --git a/test/stdout/0098 b/test/stdout/0098 index 59dcdba55..62e83a061 100644 --- a/test/stdout/0098 +++ b/test/stdout/0098 @@ -2,3 +2,5 @@ Message 10HmaX-0005vi-00 has been removed Message 10HmaZ-0005vi-00 has been removed Message 10HmbB-0005vi-00 has been removed Message 10HmbD-0005vi-00 has been removed +Message 10HmbI-0005vi-00 has been removed +Message 10HmbJ-0005vi-00 has been removed |