From 83d2a8615f6fede0c99dda5cb83dd510d7ad0269 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 31 Dec 2017 17:40:55 +0000
Subject: Fix conversation closedown with the Avast malware scanner.  Bug 2113

---
 test/scripts/4007_scan_avast/4007 | 6 +++---
 test/stdout/4007                  | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/scripts/4007_scan_avast/4007 b/test/scripts/4007_scan_avast/4007
index a58188c95..0611f2a96 100644
--- a/test/scripts/4007_scan_avast/4007
+++ b/test/scripts/4007_scan_avast/4007
@@ -10,7 +10,7 @@ server DIR/eximdir/avast_sock
 >LF>blah	[+]
 >LF>200 SCAN OK
 <QUIT
-<*eof
+*eof
 ****
 #
 #
@@ -36,7 +36,7 @@ server DIR/eximdir/avast_sock
 >LF>blah	[E]
 >LF>200 SCAN OK
 <QUIT
-<*eof
+*eof
 ****
 #
 #
@@ -62,7 +62,7 @@ server DIR/eximdir/avast_sock
 >LF>b\\ l\\ a\\ h	[L]9.9	9 VNAME
 >LF>200 SCAN OK
 <QUIT
-<*eof
+*eof
 ****
 #
 #
diff --git a/test/stdout/4007 b/test/stdout/4007
index 19e0f305b..603de1521 100644
--- a/test/stdout/4007
+++ b/test/stdout/4007
@@ -66,7 +66,7 @@ Connection request
 >LF>blah\x09[+]
 >LF>200 SCAN OK
 <QUIT
-Unexpected EOF read from client
+Expected EOF read from client
 End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
@@ -83,7 +83,9 @@ Connection request
 >LF>210 SCAN DATA
 >LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME
 >LF>200 SCAN OK
-Unexpected EOF read from client
+<QUIT
+Expected EOF read from client
+End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 *sleep 3
-- 
cgit v1.2.3