diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-05-05 21:24:17 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-05-05 21:24:17 +0100 |
| commit | a753aaff0ec5ca168a10a8033bbb51a7324db6d8 (patch) | |
| tree | 122c191c6f3ddf8a5859e274cbc2207a41a85c07 | |
| parent | ed0512a1a151a4108d7fe309055219c2da3b2bbc (diff) | |
Testsuite: fix testcase sequencing
Broken-by: f41e05066084
Replaces: 0368847fd98d
| -rw-r--r-- | test/scripts/5400-cutthrough/5400 | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400 index 1dc733aaa..5344ba51c 100644 --- a/test/scripts/5400-cutthrough/5400 +++ b/test/scripts/5400-cutthrough/5400 @@ -149,7 +149,10 @@ DATA QUIT 250 OK **** -exim -bs +# +# Foregound delivery needed else the following subtest reception logging happens before this ones +# delivery process logs and terminates; the interlock is only on the parent exim terminating. +exim -bs -odf EHLO myhost.test.ex MAIL FROM:<CALLER@myhost.test.ex> RCPT TO:<no@domain.com> @@ -160,10 +163,6 @@ DATA QUIT **** # -# The "exim" above should have waited on completion for the "server" before -# but apparently not; without this delay ordering is messed up. -# Unsatifactory. -millisleep 500 # # # @@ -200,7 +199,7 @@ DATA QUIT 250 OK **** -exim -bs +exim -bs -odf EHLO myhost.test.ex MAIL FROM:<CALLER@myhost.test.ex> RCPT TO:<userx@domain.com> @@ -212,7 +211,6 @@ QUIT **** # # -millisleep 500 # # # @@ -269,7 +267,7 @@ DATA QUIT 250 OK **** -exim -bs +exim -bs -odf EHLO myhost.test.ex MAIL FROM:<CALLER@myhost.test.ex> RCPT TO:<userx@domain.com> @@ -281,7 +279,6 @@ QUIT **** # # -millisleep 500 # # # @@ -370,7 +367,7 @@ DATA QUIT 250 OK **** -exim -bs +exim -bs -odf EHLO myhost.test.ex MAIL FROM:<CALLER@myhost.test.ex> RCPT TO:<userx@domain.com> @@ -382,7 +379,6 @@ QUIT **** # # -millisleep 500 # # # @@ -405,7 +401,7 @@ DATA QUIT 250 OK **** -exim -bs +exim -bs -odf EHLO myhost.test.ex MAIL FROM:<CALLER@myhost.test.ex> RCPT TO:<userx@localhost4.test.ex> @@ -419,5 +415,4 @@ QUIT # # # -# -sleep 1 +# End |