Cutthrough: handle request when a callout-hold is active. Bug 2604

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0022

diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index 5e20032aa67f2f2eac9a916d5f5154f5a27df05f..dd11aa23687b37abe24eb9c03f4fc50baeff465a 100644 (file)
--- a/test/scripts/0000-Basic/0022
+++ b/test/scripts/0000-Basic/0022
@@ -3,6 +3,7 @@ exim -d -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data

+

 Testing
 .
 quit
 Testing
 .
 quit


@@ -11,6 +12,7 @@ exim -d -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data

+

 Testing
 .
 quit
 Testing
 .
 quit


@@ -19,6 +21,7 @@ exim -d -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data

+

 Testing
 .
 quit
 Testing
 .
 quit


@@ -55,22 +58,26 @@ mail from:<x@y>
 rcpt to:<accept@y>
 rcpt to:<freeze@y>
 data
 rcpt to:<accept@y>
 rcpt to:<freeze@y>
 data

+

 Testing
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data
 Testing
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data

+

 Testing 2
 .
 mail from:<x@y>
 rcpt to:<queue_only@y>
 rcpt to:<accept@y>
 data
 Testing 2
 .
 mail from:<x@y>
 rcpt to:<queue_only@y>
 rcpt to:<accept@y>
 data

+

 Testing 3
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data
 Testing 3
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data

+

 Testing 4
 .
 quit
 Testing 4
 .
 quit


@@ -91,7 +98,7 @@ exim -bp
 ****
 exim -DSERVER=server -odq -bd -oX PORT_D
 ****
 ****
 exim -DSERVER=server -odq -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D 127.0.0.1
+client -t5 127.0.0.1 PORT_D

 ??? 220
 mail from:<x@y>
 ??? 250
 ??? 220
 mail from:<x@y>
 ??? 250


@@ -101,6 +108,7 @@ rcpt to:<freeze@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing
 .
 ??? 250
 Testing
 .
 ??? 250


@@ -110,6 +118,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing 2
 .
 ??? 250
 Testing 2
 .
 ??? 250


@@ -121,6 +130,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing 3
 .
 ??? 250
 Testing 3
 .
 ??? 250


@@ -130,6 +140,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
 ??? 250
 data
 ??? 354

+

 Testing 4
 .
 ??? 250
 Testing 4
 .
 ??? 250