diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-08-30 13:35:29 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-08-30 13:35:29 +0000 |
| commit | b6d223625238f89971d94711d6c5fc240ba2cd72 (patch) | |
| tree | 1619f5ed482f524ef7da75924996828f4ade5c41 /test/confs | |
| parent | f913be3678436977bbbfed4d4cf927dcd945a5e8 (diff) | |
Update tests for 4.68 (after testing on tahini).
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0206 | 2 | ||||
| -rw-r--r-- | test/confs/0256 | 3 | ||||
| -rw-r--r-- | test/confs/0461 | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/test/confs/0206 b/test/confs/0206 index d6621a43f..ca3b96eb7 100644 --- a/test/confs/0206 +++ b/test/confs/0206 @@ -13,7 +13,7 @@ gecos_name = CALLER_NAME # ----- Main settings ----- ignore_bounce_errors_after = 2s -timeout_frozen_after = 4s +timeout_frozen_after = 5s queue_run_in_order diff --git a/test/confs/0256 b/test/confs/0256 index 99faa1d76..d17ee8d9f 100644 --- a/test/confs/0256 +++ b/test/confs/0256 @@ -13,7 +13,8 @@ gecos_name = CALLER_NAME acl_smtp_rcpt = accept qualify_domain = test.ex -errors_copy = *@* ${quote_local_part::abcd+$domain+$local_part}@test.ex +errors_copy = *@* ${quote_local_part::abcd+$domain+\ + ${if eq{$local_part}{CALLER}{xxxx}{$local_part}}}@test.ex trusted_users = CALLER diff --git a/test/confs/0461 b/test/confs/0461 index 3a8907265..5b5110104 100644 --- a/test/confs/0461 +++ b/test/confs/0461 @@ -2,6 +2,8 @@ FALLBACK=fallback_hosts = 127.0.0.1 ROUTE_DATA=V4NET.0.0.1 +RETRY1=1s +RETRY2=2s exim_path = EXIM_PATH host_lookup_order = bydns @@ -53,8 +55,8 @@ t2: begin retry -V4NET.0.0.1 * F,1s,1s -V4NET.0.0.2 * F,1s,2s +V4NET.0.0.1 * F,1s,RETRY1 +V4NET.0.0.2 * F,1s,RETRY2 * * F,1d,1s |