Testsuite: Add munge for EXPERIMENTAL_DSN_INFO
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 7 Nov 2015 12:48:06 +0000 (12:48 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 8 Nov 2015 16:15:46 +0000 (16:15 +0000)
13 files changed:
test/mail/4203.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
test/mail/4213.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
test/mail/4223.यहलोगहिन्दीक्योंनहींबोलसकतेहैं
test/runtest
test/scripts/0000-Basic/0211
test/scripts/0000-Basic/0253
test/scripts/0000-Basic/0374
test/scripts/0000-Basic/0375
test/scripts/0000-Basic/0531
test/scripts/4200-International/4203
test/scripts/4210-GnuTLS-International/4213
test/scripts/4220-OpenSSL-International/4223
test/scripts/4700-dsn-info/4700 [changed from symlink to file mode: 0644]

index df022c5..35c0ea7 100644 (file)
@@ -14,8 +14,6 @@ MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-X-body-linecount: 38
-X-message-linecount: 50
 X-received-count: 1
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
index df022c5..35c0ea7 100644 (file)
@@ -14,8 +14,6 @@ MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-X-body-linecount: 38
-X-message-linecount: 50
 X-received-count: 1
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
index df022c5..35c0ea7 100644 (file)
@@ -14,8 +14,6 @@ MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-X-body-linecount: 38
-X-message-linecount: 50
 X-received-count: 1
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
index 6899cae..7af3076 100755 (executable)
@@ -1380,6 +1380,10 @@ $munges =
     'debug_pid' =>
     { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d{1,5}/ppppp/g' },
 
+    'optional_dsn_info' =>
+    { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/'
+    }
+
   };
 
 
index ddf9906..2775d20 100644 (file)
@@ -1,5 +1,6 @@
 # SMTP connection & EHLO/HELO error responses (+log_sender_on_delivery)
 need_ipv4
+munge optional_dsn_info
 #
 server PORT_S
 450 I'm busy
index 56362e0..e0936bb 100644 (file)
@@ -1,5 +1,6 @@
 # return_path on appendfile and smtp transports
 need_ipv4
+munge optional_dsn_info
 #
 exim -odi -f abc@x.y.z userx
 Test message
index 810efbd..e41e2dc 100644 (file)
@@ -1,5 +1,6 @@
 # unseen without disable_logging and errors_to = ""
 need_ipv4
+munge optional_dsn_info
 #
 server -t 10 PORT_S 3
 220
index 8d2608f..be4d7d3 100644 (file)
@@ -1,5 +1,6 @@
 # unseen with disable_logging and errors_to = "" or forced fail
 need_ipv4
+munge optional_dsn_info
 #
 server -t 10 PORT_S 7
 220
index 5e89595..912fff6 100644 (file)
@@ -1,5 +1,6 @@
 # LMTP over TCP/IP - temporary error handling
 need_ipv4
+munge optional_dsn_info
 # This one has no retry time, so will be bounced immediately.
 #
 server PORT_S
index 862de0c..310cbd7 100644 (file)
@@ -1,5 +1,6 @@
 # Internationalised mail: forwarding fail
 # Exim test configuration 4203
+munge optional_dsn_info
 #
 exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
 ****
index 7979156..c5b4b08 100644 (file)
@@ -1,6 +1,7 @@
 # Internationalised mail: forwarding fail
 # Exim test configuration 4213
 gnutls
+munge optional_dsn_info
 #
 exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
 ****
index 2a836a8..5178bf1 100644 (file)
@@ -1,5 +1,6 @@
 # Internationalised mail: forwarding fail
 # Exim test configuration 4223
+munge optional_dsn_info
 #
 exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
 ****
deleted file mode 120000 (symlink)
index e480f349455331b026da6ba72ce89e02acb382e6..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-../0000-Basic/0211
\ No newline at end of file
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..d0dd4f363ba28cb69e4165608207faafd7eaa996
--- /dev/null
@@ -0,0 +1,41 @@
+# DSN extra information
+need_ipv4
+#
+server PORT_S
+450 I'm busy
+QUIT
+250 OK
+****
+exim -odi userx@domain1
+Test message 1
+****
+server PORT_S
+220 Connected OK
+EHLO
+450 I'm busy
+HELO
+450 I'm busy
+QUIT
+250 OK
+****
+exim -qf
+****
+server PORT_S
+550 Go away
+QUIT
+250 OK
+****
+exim -qf
+****
+server PORT_S
+220 Connected OK
+EHLO
+550 Go away
+HELO
+550 Go away
+QUIT
+250 OK
+****
+exim -odi userx@domain1 usery@domain2
+Test message 2
+****