diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0092 | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0092 | 7 | ||||
| -rw-r--r-- | test/stderr/0092 | 71 | ||||
| -rw-r--r-- | test/stdout/0092 | 10 |
4 files changed, 90 insertions, 1 deletions
diff --git a/test/confs/0092 b/test/confs/0092 index 15f1f5d1c..62157cb33 100644 --- a/test/confs/0092 +++ b/test/confs/0092 @@ -17,7 +17,8 @@ gecos_name = CALLER_NAME # ----- Main settings ----- -smtp_receive_timeout = 2s +OPT = 2s +smtp_receive_timeout = OPT receive_timeout = 2s diff --git a/test/scripts/0000-Basic/0092 b/test/scripts/0000-Basic/0092 index 78c713e1c..153431753 100644 --- a/test/scripts/0000-Basic/0092 +++ b/test/scripts/0000-Basic/0092 @@ -19,6 +19,13 @@ data The quick brown fox **** 1 +3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1 +mail from:userx@test.ex +rcpt to:userx@test.ex +data +The quick brown fox +**** +1 3 exim userx@test.ex **** 1 diff --git a/test/stderr/0092 b/test/stderr/0092 index 09bf352d1..4cae3dbf7 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -32,6 +32,77 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex> +Exim version x.yz .... +changed uid/gid: forcing real = effective + uid=uuuu gid=CALLER_GID pid=pppp +configuration file is TESTSUITE/test-config +admin user +changed uid/gid: privilege not needed + uid=EXIM_UID gid=EXIM_GID pid=pppp +DSN: fail_remote_domains propagating DSN +DSN: forward propagating DSN +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME +sender address = CALLER@myhost.test.ex +sender_fullhost = [V4NET.0.0.1] +sender_rcvhost = [V4NET.0.0.1] +host in hosts_connection_nolog? no (option unset) +LOG: smtp_connection MAIN + SMTP connection from [V4NET.0.0.1] +host in host_lookup? no (option unset) +set_process_info: pppp handling incoming connection from [V4NET.0.0.1] +expanding: V4NET.0.0.1 + result: V4NET.0.0.1 +expanding: $sender_host_address + result: V4NET.0.0.1 +condition: eq {V4NET.0.0.1} {$sender_host_address} + result: true +expanding: 2 + result: 2 +expanding: 30 + result: 30 +skipping: result is not used +expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s + result: 2s +host in host_reject_connection? no (option unset) +host in sender_unqualified_hosts? no (option unset) +host in recipient_unqualified_hosts? no (option unset) +host in helo_verify_hosts? no (option unset) +host in helo_try_verify_hosts? no (option unset) +host in helo_accept_junk_hosts? no (option unset) +expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +smtp_setup_msg entered +SMTP<< mail from:userx@test.ex +SMTP>> 250 OK +SMTP<< rcpt to:userx@test.ex +using ACL "check_recipient" +processing "accept" +check hosts = : +host in ":"? no (end of list) +accept: condition test failed in ACL "check_recipient" +processing "deny" + message: unrouteable address +check recipients = verify@test.ex +address match test: subject=userx@test.ex pattern=verify@test.ex +userx@test.ex in "verify@test.ex"? no (end of list) +deny: condition test failed in ACL "check_recipient" +processing "accept" +check domains = +local_domains +test.ex in "test.ex : *.test.ex"? yes (matched "test.ex") +test.ex in "+local_domains"? yes (matched "+local_domains") +accept: condition test succeeded in ACL "check_recipient" +end of ACL "check_recipient": ACCEPT +SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 +SMTP<< data +SMTP>> 354 Enter message, ending with "." on a line by itself +search_tidyup called +LOG: lost_incoming_connection MAIN + SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex> +SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection. +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>> exim: timed out while reading - message abandoned exim: timed out while reading - message abandoned >>> host in hosts_connection_nolog? no (option unset) diff --git a/test/stdout/0092 b/test/stdout/0092 index 3656b9120..6e8d05716 100644 --- a/test/stdout/0092 +++ b/test/stdout/0092 @@ -29,6 +29,16 @@ 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+421 myhost.test.ex SMTP incoming data timeout - closing connection.
+ +**** SMTP testing session as if from host V4NET.0.0.1 +**** but without any ident (RFC 1413) callback. +**** This is not for real! + +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
550 unrouteable address
421 myhost.test.ex: SMTP command timeout - closing connection
421 SMTP command timeout |