diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-08-30 13:35:29 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-08-30 13:35:29 +0000 |
| commit | b6d223625238f89971d94711d6c5fc240ba2cd72 (patch) | |
| tree | 1619f5ed482f524ef7da75924996828f4ade5c41 /test/scripts | |
| parent | f913be3678436977bbbfed4d4cf927dcd945a5e8 (diff) | |
Update tests for 4.68 (after testing on tahini).
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/0000-Basic/0206 | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0333 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0374 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0461 | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0542 | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0553 | 1 |
6 files changed, 7 insertions, 9 deletions
diff --git a/test/scripts/0000-Basic/0206 b/test/scripts/0000-Basic/0206 index baf8571ef..6f9968f96 100644 --- a/test/scripts/0000-Basic/0206 +++ b/test/scripts/0000-Basic/0206 @@ -1,12 +1,12 @@ # timeout_frozen_after with ignore_bounce_errors_after sudo exim -odi -f unknown@test.ex nonexist@test.ex freeze@test.ex **** -sleep 2 +sleep 1 sudo exim -Mf $msg1 **** exim -qf **** -sleep 2 +sleep 3 exim -q **** no_msglog_check diff --git a/test/scripts/0000-Basic/0333 b/test/scripts/0000-Basic/0333 index 1cb3de2e7..92d927e4d 100644 --- a/test/scripts/0000-Basic/0333 +++ b/test/scripts/0000-Basic/0333 @@ -34,4 +34,4 @@ QUIT **** exim -d-all+route -M $msg1 **** -millisleep 100 +millisleep 500 diff --git a/test/scripts/0000-Basic/0374 b/test/scripts/0000-Basic/0374 index 2bde68338..810efbda5 100644 --- a/test/scripts/0000-Basic/0374 +++ b/test/scripts/0000-Basic/0374 @@ -1,7 +1,7 @@ # unseen without disable_logging and errors_to = "" need_ipv4 # -server PORT_S 3 +server -t 10 PORT_S 3 220 EHLO 220 OK diff --git a/test/scripts/0000-Basic/0461 b/test/scripts/0000-Basic/0461 index 0d89ec1dc..04c1911ed 100644 --- a/test/scripts/0000-Basic/0461 +++ b/test/scripts/0000-Basic/0461 @@ -54,7 +54,7 @@ DATA QUIT 221 OK **** -exim -odi userx@test.ex +exim -DRETRY1=5s -odi userx@test.ex Short message **** exim -DFALLBACK= -odi userx@test.ex @@ -64,7 +64,7 @@ exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex Short message **** sleep 3 -exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -q +exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -DRETRY2=5s -q **** exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@test.ex Short message diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542 index 6b14852b5..0c6362bde 100644 --- a/test/scripts/0000-Basic/0542 +++ b/test/scripts/0000-Basic/0542 @@ -10,7 +10,6 @@ sudo exim -be -Mset $msg1 From: $h_from: Subject: $h_subject: message_body_size=$message_body_size -message_size=$message_size message_id=$message_id message_exim_id=$message_exim_id max_received_linelength=$max_received_linelength @@ -33,7 +32,6 @@ sudo exim -be -Mset $msg2 From: $h_from: Subject: $h_subject: message_body_size=$message_body_size -message_size=$message_size message_id=$message_id message_exim_id=$message_exim_id max_received_linelength=$max_received_linelength @@ -51,7 +49,6 @@ exim -bem DIR/test-data from: $h_from: to: $h_to: subject: $h_subject: -message_size=$message_size message_body_size=$message_body_size message_exim_id=$message_exim_id message_linecount=$message_linecount diff --git a/test/scripts/0000-Basic/0553 b/test/scripts/0000-Basic/0553 index 07dfb0bed..6ee86a82e 100644 --- a/test/scripts/0000-Basic/0553 +++ b/test/scripts/0000-Basic/0553 @@ -11,6 +11,7 @@ exim -qf **** sleep 1 killdaemon +sleep 1 # # This daemon should flush before delaying exim -DSERVER=server -bd -oX PORT_D |