diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-02-08 15:16:19 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-02-08 15:16:19 +0000 |
| commit | 4311097ecf0db28101920522340c59469582529e (patch) | |
| tree | 1c8636a5d16e7e0ea4fb9209389bdbc2e33fdcea /test | |
| parent | 7c5214ecc29b8fc23e15030db8207e3ff2cb4fc6 (diff) | |
Fix bad outgoing_port in log line for delivery of a re-used connection.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0033 | 1 | ||||
| -rw-r--r-- | test/confs/0179 | 1 | ||||
| -rw-r--r-- | test/log/0179 | 4 | ||||
| -rwxr-xr-x | test/runtest | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/confs/0033 b/test/confs/0033 index e8e995044..6b455fa8a 100644 --- a/test/confs/0033 +++ b/test/confs/0033 @@ -13,7 +13,6 @@ gecos_name = CALLER_NAME domainlist local_domains = test.ex : *.test.ex - # ----- Routers ----- begin routers diff --git a/test/confs/0179 b/test/confs/0179 index 1d46531c3..0aee0c056 100644 --- a/test/confs/0179 +++ b/test/confs/0179 @@ -12,6 +12,7 @@ gecos_name = CALLER_NAME # ----- Main settings ----- queue_run_in_order +log_selector = +outgoing_port # ----- Routers ----- diff --git a/test/log/0179 b/test/log/0179 index 164a8febd..c4d302a4a 100644 --- a/test/log/0179 +++ b/test/log/0179 @@ -1,8 +1,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]:1224 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]* +1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]:1224* 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qqf diff --git a/test/runtest b/test/runtest index 328b89958..4e511dc36 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.23 2007/01/31 16:52:12 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.24 2007/02/08 15:16:19 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -521,8 +521,8 @@ while(<IN>) s/\(port=(\d+)/"(port=" . new_value($1, "%s", \$next_port)/e; # This handles "connection from" and the like, when the port is given - if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/\*>/ && - !/Connection refused/) + if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/->/ + && !/\*>/ && !/Connection refused/) { s/\[([a-z\d:]+|\d+(?:\.\d+){3})\]:(\d+)/"[".$1."]:".new_value($2,"%s",\$next_port)/ie; } |