From e33f4e0bc7429038ba6aa82285ae8749c9037c88 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Mon, 6 Feb 2023 15:59:13 +0100 Subject: [PATCH] pasta: Use two connections instead of three in TCP range forward tests For some reason I couldn't figure out yet, on CI systems running Fedora 37, tests for TCP port forwarding with ranges fail on the third connection, as connect() from the socat client gets interrupted -- and socat doesn't handle this. Mitigate this by connecting twice, to two different ports, instead of using three ports. Reported-by: Ed Santiago Link: https://github.com/containers/podman/issues/17287 Signed-off-by: Stefano Brivio --- test/system/505-networking-pasta.bats | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/system/505-networking-pasta.bats b/test/system/505-networking-pasta.bats index 84733f9c53..f6cc80d942 100644 --- a/test/system/505-networking-pasta.bats +++ b/test/system/505-networking-pasta.bats @@ -382,11 +382,11 @@ function teardown() { } @test "podman networking with pasta(1) - TCP port range forwarding, IPv4, tap" { - pasta_test_do 4 tap tcp 3 0 "port" 1 + pasta_test_do 4 tap tcp 2 0 "port" 1 } @test "podman networking with pasta(1) - TCP port range forwarding, IPv4, loopback" { - pasta_test_do 4 loopback tcp 3 0 "port" 1 + pasta_test_do 4 loopback tcp 2 0 "port" 1 } @test "podman networking with pasta(1) - Translated TCP port forwarding, IPv4, tap" { @@ -398,11 +398,11 @@ function teardown() { } @test "podman networking with pasta(1) - TCP translated port range forwarding, IPv4, tap" { - pasta_test_do 4 tap tcp 3 1 "port" 1 + pasta_test_do 4 tap tcp 2 1 "port" 1 } @test "podman networking with pasta(1) - TCP translated port range forwarding, IPv4, loopback" { - pasta_test_do 4 loopback tcp 3 1 "port" 1 + pasta_test_do 4 loopback tcp 2 1 "port" 1 } @test "podman networking with pasta(1) - Address-bound TCP port forwarding, IPv4, tap" { @@ -432,7 +432,7 @@ function teardown() { } @test "podman networking with pasta(1) - TCP port range forwarding, IPv6, tap" { - pasta_test_do 6 tap tcp 3 0 "port" 1 + pasta_test_do 6 tap tcp 2 0 "port" 1 } @test "podman networking with pasta(1) - TCP port range forwarding, IPv6, loopback" { @@ -448,11 +448,11 @@ function teardown() { } @test "podman networking with pasta(1) - TCP translated port range forwarding, IPv6, tap" { - pasta_test_do 6 tap tcp 3 1 "port" 1 + pasta_test_do 6 tap tcp 2 1 "port" 1 } @test "podman networking with pasta(1) - TCP translated port range forwarding, IPv6, loopback" { - pasta_test_do 6 loopback tcp 3 1 "port" 1 + pasta_test_do 6 loopback tcp 2 1 "port" 1 } @test "podman networking with pasta(1) - Address-bound TCP port forwarding, IPv6, tap" {