diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-10-24 12:58:19 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-10-24 12:58:19 +0100 |
| commit | 444163417b289354b53d4708760f31d947ac6fd1 (patch) | |
| tree | b2e07cfb7ca7f7364119ee37b2132935e36effcf /test/scripts/0000-Basic | |
| parent | 979c462ed43bd4f53f61a0031ec22967dea83902 (diff) | |
Testsuite: handle slow test-hosts more intelligently
Diffstat (limited to 'test/scripts/0000-Basic')
| -rw-r--r-- | test/scripts/0000-Basic/0206 | 8 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0618 | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/scripts/0000-Basic/0206 b/test/scripts/0000-Basic/0206 index 64afd8014..2739f29e1 100644 --- a/test/scripts/0000-Basic/0206 +++ b/test/scripts/0000-Basic/0206 @@ -6,11 +6,11 @@ sudo exim -Mf $msg1 **** # now 2 frozen, one of which is a bounce # check that ignore_bounce_errors_after finishes off the frozen bounce (only) -millisleep 2500 -exim -qf +#sleep 5 +exim -Tqt 5s/5s/ -qf **** -sleep 3 +#sleep 6 # check that timeout_frozen_after finishes off the (remaining) frozen -exim -q +exim -Tqt 11s/11s -q **** no_msglog_check diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618 index 13d395f02..69a53c691 100644 --- a/test/scripts/0000-Basic/0618 +++ b/test/scripts/0000-Basic/0618 @@ -76,8 +76,9 @@ exim -q # # Client requests notification of deferral. First time of trying, we get # a defer but queue-time probably has not hit the 1st retry time yet, so no DSN -# will be sent and the message remains queued. Later, after a sleep, we will -# try again. +# will be sent and the message remains queued. Then, claiming time has elapsed, +# we will look again (expecting a delay-DSN to be produced). We won't see a +# retry since the actual retry time has not passed. exim -z defer/delay **** client HOSTIPV4 PORT_D @@ -126,7 +127,6 @@ QUIT **** exim -q **** -sleep 3 # # # @@ -134,7 +134,7 @@ sleep 3 # We should see the notify for c@dump.ex but not d@dump.ex exim -z playout **** -exim -q +exim -Tqt 10s/ -q **** sleep 1 exim -Mrm $msg1 $msg2 |