From cb340d8d9746cdaab9ebe2eb5c1e72b4e29dd24e Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sun, 23 Oct 2016 22:43:18 +0100 Subject: [PATCH] Testsuite: account for platforms not supporting TFO, redux --- test/runtest | 6 ++---- test/stderr/0388 | 4 ++-- test/stderr/0398 | 2 +- test/stderr/0432 | 6 +++--- test/stderr/5403 | 2 +- test/stderr/5410 | 6 +++--- test/stderr/5420 | 6 +++--- test/stderr/5840 | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/test/runtest b/test/runtest index afaaee3b2..5360b3303 100755 --- a/test/runtest +++ b/test/runtest @@ -1046,11 +1046,9 @@ RESET_AFTER_EXTRA_LINE_READ: s/^((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/; # Not all platforms support TCP Fast Open, and the compile omits the check - if (/^((>>> )?Connecting to .* )in hosts_try_fastopen\? no \(option unset\)$/) + if (s/\S+ in hosts_try_fastopen\? no \(option unset\)\n$//) { - my $p = $1; - $_ = ; - s/^/$p/; + $_ .= } # When Exim is checking the size of directories for maildir, it uses diff --git a/test/stderr/0388 b/test/stderr/0388 index e5b3baa25..399edd821 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -81,7 +81,7 @@ returned from EXIM_DBOPEN no retry data available 127.0.0.1 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex @@ -112,7 +112,7 @@ returned from EXIM_DBOPEN no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... V4NET.0.0.0 failed: Network is unreachable +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network is unreachable LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER diff --git a/test/stderr/0398 b/test/stderr/0398 index 2cac34e90..3e3994b99 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -129,7 +129,7 @@ dbfn_read: key=qq@remote callout cache: no address record found for qq@remote closed hints database and lockfile interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO mail.test.ex diff --git a/test/stderr/0432 b/test/stderr/0432 index 2abb55cc1..885d62f0e 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -90,7 +90,7 @@ dbfn_read: key=x@y callout cache: no address record found for x@y closed hints database and lockfile interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex @@ -255,7 +255,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for b >>> callout cache: no address record found for a@b >>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... >>> connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -300,7 +300,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for q >>> callout cache: no address record found for p1@q >>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... >>> connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5403 b/test/stderr/5403 index a4104fe3c..3c09ea605 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -69,7 +69,7 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: disabled by no_cache >>> interface=ip4.ip4.ip4.ip4 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... 127.0.0.1 >>> connected +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... >>> connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5410 b/test/stderr/5410 index f96491248..7916518b7 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -49,7 +49,7 @@ considering: $local_part expanding: $local_part result: userx domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected considering: $primary_hostname expanding: $primary_hostname result: myhost.test.ex @@ -313,7 +313,7 @@ considering: $local_part expanding: $local_part result: usery domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected considering: $primary_hostname expanding: $primary_hostname result: myhost.test.ex @@ -544,7 +544,7 @@ considering: $local_part expanding: $local_part result: usery domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected considering: $primary_hostname expanding: $primary_hostname result: myhost.test.ex diff --git a/test/stderr/5420 b/test/stderr/5420 index a3c140012..a12451575 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -49,7 +49,7 @@ considering: $local_part expanding: $local_part result: userx domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected considering: $primary_hostname expanding: $primary_hostname result: myhost.test.ex @@ -312,7 +312,7 @@ considering: $local_part expanding: $local_part result: usery domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected considering: $primary_hostname expanding: $primary_hostname result: myhost.test.ex @@ -543,7 +543,7 @@ considering: $local_part expanding: $local_part result: usery domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected +Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected considering: $primary_hostname expanding: $primary_hostname result: myhost.test.ex diff --git a/test/stderr/5840 b/test/stderr/5840 index 082e073c8..556a26bb5 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -18,7 +18,7 @@ >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for CALLER@dane256ee.test.ex >>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... ip4.ip4.ip4.ip4 >>> connected +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... >>> connected MUNGED: ::1 will be omitted in what follows >>> get[host|ipnode]byname[2] looked up these IP addresses: >>> name=thishost.test.ex address=127.0.0.1 -- 2.30.2