diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-08-13 20:42:07 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-08-14 15:16:50 +0100 |
| commit | 9af85efb7be828ea239d51731571b25094211cf6 (patch) | |
| tree | b8971cb9bc0457e09ab3132f6da30e252233c175 /test/scripts | |
| parent | 766af058762b2c4e21b69f335adf77265fe9509a (diff) | |
| download | exim4-9af85efb7be828ea239d51731571b25094211cf6.tar.gz | |
Testsuite: use more reliable IP for TFO testcases
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/1090-TCP-Fast-Open/1090 | 12 | ||||
| -rw-r--r-- | test/scripts/4058-pipe-conn-tfo/4058 | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/scripts/1090-TCP-Fast-Open/1090 b/test/scripts/1090-TCP-Fast-Open/1090 index d2c7b75f9..840579b7a 100644 --- a/test/scripts/1090-TCP-Fast-Open/1090 +++ b/test/scripts/1090-TCP-Fast-Open/1090 @@ -30,7 +30,7 @@ # FreeBSD: tried this setup, but we only get the banner captured 100ms after 3rd-ack: # #kenv net.inet.ip.fw.default_to_accept=1 # #kldload ipfw dummynet -# #ipfw add 00097 pipe 1 ip from 127.0.0.1 to 127.0.0.1 +# #ipfw add 00097 pipe 1 ip from HOSTIPV4 to HOSTIPV4 # #ipfw pipe 1 config delay 50ms # Also, the VM managed to lose the ipv4 & 6 addrs on its main interface # after a while - so not usable in production @@ -54,7 +54,7 @@ system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 0 # the client ACK). # # The client log => line should have a "TFO" element. -# The server log <= line for a@test.ex should not. +# The server log <= line for no_cookie@test.ex should not. # # First clear any previously-obtained cookie: sudo perl @@ -63,7 +63,7 @@ $_ = <INFO>; if (/^FreeBSD/) { system("sysctl net.inet.tcp.fastopen.client_enable=0"); system("sysctl net.inet.tcp.fastopen.client_enable=1"); } else { -system ("ip tcp_metrics delete 127.0.0.1"); +system ("ip tcp_metrics delete HOSTIPV4"); } **** @@ -73,16 +73,16 @@ system ("ip tcp_metrics delete 127.0.0.1"); exim -DSERVER=server -bd -oX PORT_D **** # -exim a@test.ex +exim no_cookie@test.ex Testing **** sleep 3 # -# The server log <= line for b@test.ex should have a "TFO" element, but +# The server log <= line for with_cookie@test.ex should have a "TFO" element, but # this will only be obtained when the above delay is inserted into the # loopback net path. # -exim b@test.ex +exim with_cookie@test.ex Testing **** sleep 3 diff --git a/test/scripts/4058-pipe-conn-tfo/4058 b/test/scripts/4058-pipe-conn-tfo/4058 index 5f0257810..2a0639095 100644 --- a/test/scripts/4058-pipe-conn-tfo/4058 +++ b/test/scripts/4058-pipe-conn-tfo/4058 @@ -6,7 +6,7 @@ # Disable TFO blackhole-detection as we seem to be running afoul of that sudo perl system ("tc qdisc add dev lo root netem delay 50ms"); -system ("ip tcp_metrics delete 127.0.0.1"); +system ("ip tcp_metrics delete HOSTIPV4"); system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 0 > /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec"); **** # |