summaryrefslogtreecommitdiff
path: root/test/stdout
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-01-22 15:17:04 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-01-22 15:17:04 +0000
commit8852dff2f3aa2b5a31505febb195d1c6fed620f1 (patch)
tree1b6160b3158e2f303e3e076f4ff550e040aaf9fb /test/stdout
parente2f7a0d23192ebd03b783db210dd1ff4bf774bba (diff)
Additional tests - didn't show any problems.
Diffstat (limited to 'test/stdout')
-rw-r--r--test/stdout/00378
-rw-r--r--test/stdout/054815
2 files changed, 19 insertions, 4 deletions
diff --git a/test/stdout/0037 b/test/stdout/0037
index 9087a8915..603298279 100644
--- a/test/stdout/0037
+++ b/test/stdout/0037
@@ -227,7 +227,7 @@ Testprint: body_linecount = 2
Testprint: message_body = This is the body of
Testprint: message_body_end = ible in the filter.
Logfile TESTSUITE/spool/log/mainlog
-Logwrite "1999-03-02 09:44:33 10HmcC-0005vi-00 "message for filter test" first delivery\n"
+Logwrite "1999-03-02 09:44:33 10HmcE-0005vi-00 "message for filter test" first delivery\n"
Headers add "X-added: qualify_domain is test.ex"
Headers remove "remove-this"
Unseen deliver message to: userz@test.ex errors_to abcd@test.ex
@@ -239,11 +239,11 @@ Recipient = CALLER@test.ex
Testing Exim filter file "TESTSUITE/aux-var/0037.F"
Testprint: ------------------------------------------------
-Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcD-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
Testprint: ------------------------------------------------
Headers remove "test-headers:more-test-headers"
Headers add "added-header: this is added\nadded-header2: a second line"
-Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcD-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line
+Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line
Testprint: ------------------------------------------------
Testprint: message_size = 122
Testprint: message_body_size = 0
@@ -251,7 +251,7 @@ Testprint: body_linecount = 0
Testprint: message_body =
Testprint: message_body_end =
Logfile TESTSUITE/spool/log/mainlog
-Logwrite "1999-03-02 09:44:33 10HmcD-0005vi-00 "testing, testing" first delivery\n"
+Logwrite "1999-03-02 09:44:33 10HmcF-0005vi-00 "testing, testing" first delivery\n"
Headers add "X-added: qualify_domain is test.ex"
Headers remove "remove-this"
Unseen deliver message to: userz@test.ex errors_to abcd@test.ex
diff --git a/test/stdout/0548 b/test/stdout/0548
new file mode 100644
index 000000000..b12491f7a
--- /dev/null
+++ b/test/stdout/0548
@@ -0,0 +1,15 @@
++++++++++++++++++++++++++++
+ R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+first failed = time last try = time2 next try = time2 + 1
+ T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+first failed = time last try = time2 next try = time2 + 1
++++++++++++++++++++++++++++
+ R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+first failed = time last try = time2 next try = time2 + 5 *
+ T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+first failed = time last try = time2 next try = time2 + 1
++++++++++++++++++++++++++++
+ R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+first failed = time last try = time2 next try = time2 + 5 *
+ T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+first failed = time last try = time2 next try = time2 + 1