Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / stdout / 0373

diff --git a/test/stdout/0373 b/test/stdout/0373
index b6f6f1905abc93ef29ed0b2ff98de31323c11ea8..1e97d0decc859d5e203e300f2bd9d206f8055fc4 100644 (file)
--- a/test/stdout/0373
+++ b/test/stdout/0373
@@ -1,6 +1,8 @@
+> connfail cases (no server)
 > Failed: failed to connect to socket TESTSUITE/test-socket: No such file or directory
 > 2 ++ no socket ++
 > 
+> unix-socket cases
 > 1 >>ANSWER-1
 <<
 > 2 >>ANSWER-2<<
@@ -13,19 +15,43 @@
 > 9 >>sock error<<
 > 
 451 Temporary local problem - please try later\r
-> 1 >>ANSWER-1
+> ipv4 cases
+> 1  ANSWER-1      >>ANSWER-1
 <<
-> 2 >>ANSWER-2<<
-> 3 >>ANSWER-3*EOL*<<
-> 4 >>ANSWER-4*EOL*<<
-> 5 >>ANSWER-5<<
-> 6 >><<
-> 7 >><<
+> 2  ANSWER-2      >>ANSWER-2<<
+> 3  ANSWER-3*EOL* >>ANSWER-3*EOL*<<
+> 4  ANSWER-4*EOL* >>ANSWER-4*EOL*<<
+> 5  ANSWER-5      >>ANSWER-5<<
+> 6                >><<
+> 7                >><<
 > Failed: socket read timed out
-> 9 >>sock error<<
-> 10 >>ANSWER-10
+> 9  sock error    >>sock error<<
+> 10 ANSWER-10\n     >>ANSWER-10
+<<
+> 11 ANSWER-11     >><<
+> 
+> eol-replacement arg
+> 12 ANSWER-12x2  (no arg)     >>ANSWER-12\r\nANSWER-12\r\n<<
+> 13 ANSWER-13x2  (empty arg)  >>ANSWER-13\r\nANSWER-13\r\n<<
+> 14 ANSWER-14x2  X            >>ANSWER-14\rXANSWER-14\rX<<
+> 15 ANSWER-15x2  XYZZY        >>ANSWER-15\rXYZZYANSWER-15\rXYZZY<<
+> 16 ANSWER-16x2  (space)      >>ANSWER-16\r ANSWER-16\r <<
+> 17 ANSWER-17x2  (newline)    >>ANSWER-17\r\nANSWER-17\r\n<<
+> 
+> Failed: failed to connect to any address for 127.0.0.1: Connection refused
+> 
+> caching of response value
+> 1  >>ANSWER-1
+<<
+> 1+ >>ANSWER-1
 <<
-> 11 >>ANSWER-11
+> 2  >>ANSWER-2
+<<
+> 2- >>expected failure<<
+> 1- >>expected failure<<
+> 1+ >>ANSWER-1
+<<
+> 1- >>ANSWER-1
 <<
 > 
 
@@ -126,4 +152,50 @@ Listening on port 1224 ...
 Connection request from [ip4.ip4.ip4.ip4]
 >LF>ANSWER-11
 >*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+QUERY-12
+>>ANSWER-12\x0d\x0aANSWER-12\x0d\x0a
+>*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+QUERY-13
+>>ANSWER-13\x0d\x0aANSWER-13\x0d\x0a
+>*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+QUERY-14
+>>ANSWER-14\x0d\x0aANSWER-14\x0d\x0a
+>*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+QUERY-15
+>>ANSWER-15\x0d\x0aANSWER-15\x0d\x0a
+>*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+QUERY-16
+>>ANSWER-16\x0d\x0aANSWER-16\x0d\x0a
+>*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+QUERY-17
+>>ANSWER-17\x0d\x0aANSWER-17\x0d\x0a
+>*eof
+End of script
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-1
+>LF>ANSWER-1
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-2
+>LF>ANSWER-2
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-1
+>LF>ANSWER-1
+>*eof
 End of script