summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-11-12 14:47:01 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2014-11-12 14:47:01 +0000
commitcf407cb650cdf6bff3b624afd5dca677ad54ba4a (patch)
tree8a2f293e4997eb269d2b36a5b3002a7b6c6b394e /test
parente9477a08d2d1f528b1f127f1d563d77e2cf24a22 (diff)
Testsuite: 0393 intermittently spits an extra stderr line. Unimportant
for the testcase, so ignore it.
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest13
-rw-r--r--test/scripts/0000-Basic/03933
-rw-r--r--test/stderr/03931
3 files changed, 11 insertions, 6 deletions
diff --git a/test/runtest b/test/runtest
index c6111678f..6d4cc1c74 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1302,19 +1302,22 @@ return 1;
##################################################
$munges =
{ 'dnssec' =>
- { 'stderr' => '/^Reverse DNS security status: unverified\n/', },
+ { 'stderr' => '/^Reverse DNS security status: unverified\n/' },
'gnutls_unexpected' =>
- { 'mainlog' => '/\(recv\): A TLS packet with unexpected length was received./', },
+ { 'mainlog' => '/\(recv\): A TLS packet with unexpected length was received./' },
'gnutls_handshake' =>
- { 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/', },
+ { 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/' },
'optional_events' =>
- { 'stdout' => '/event_action =/', },
+ { 'stdout' => '/event_action =/' },
'optional_ocsp' =>
- { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/', },
+ { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/' },
+
+ 'no_tpt_filter_epipe' =>
+ { 'stderr' => '/^writing error 32: Broken pipe$/' },
};
diff --git a/test/scripts/0000-Basic/0393 b/test/scripts/0000-Basic/0393
index 89a1b6a98..f34154c93 100644
--- a/test/scripts/0000-Basic/0393
+++ b/test/scripts/0000-Basic/0393
@@ -1,4 +1,7 @@
# empty transport filter
+#
+munge no_tpt_filter_epipe
+#
exim -d-all+transport -odi userx
Testing with filter
****
diff --git a/test/stderr/0393 b/test/stderr/0393
index b45f77703..a7d72dc98 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -72,7 +72,6 @@ writing to file TESTSUITE/test-mail/userx
writing data block fd=dddd size=sss timeout=0
process pppp running as transport filter: write=dddd read=dddd
writing data block fd=dddd size=sss timeout=0
-writing error 32: Broken pipe
process pppp writing to transport filter
copying from the filter
waiting for filter process