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 <santiago@redhat.com>
Link: https://github.com/containers/podman/issues/17287
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio
2023-02-06 15:59:13 +01:00
parent 004d611cba
commit e33f4e0bc7

View File

@ -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" {