Revert^3 "pasta: Use two connections instead of three in TCP range forward tests"

This reverts commit c2a24abc0d, which
itself reverted 1c08f2edac, which
reverted e33f4e0bc7.

The original e33f4e0bc7 "pasta: Use two connections instead of three
in TCP range forward tests" was a workaround to avoid intermittent
errors in CI where the pasta networking port range forwarding tests
would fail.  It was reverted and unreverted when we thought we'd fixed
the problem, but that turned out not to be the case.

We're now much more confident that we've genuinely found and fixed (or
at least, worked around) the underlying problem, so we revert it again.

Link: https://github.com/containers/podman/issues/17287

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson
2023-06-28 14:33:02 +10:00
parent 17cd5aecbb
commit e4efd709d9

View File

@@ -389,11 +389,11 @@ function teardown() {
}
@test "podman networking with pasta(1) - TCP port range forwarding, IPv4, tap" {
pasta_test_do 4 tap tcp 2 0 "port" 1
pasta_test_do 4 tap tcp 3 0 "port" 1
}
@test "podman networking with pasta(1) - TCP port range forwarding, IPv4, loopback" {
pasta_test_do 4 loopback tcp 2 0 "port" 1
pasta_test_do 4 loopback tcp 3 0 "port" 1
}
@test "podman networking with pasta(1) - Translated TCP port forwarding, IPv4, tap" {
@@ -405,11 +405,11 @@ function teardown() {
}
@test "podman networking with pasta(1) - TCP translated port range forwarding, IPv4, tap" {
pasta_test_do 4 tap tcp 2 1 "port" 1
pasta_test_do 4 tap tcp 3 1 "port" 1
}
@test "podman networking with pasta(1) - TCP translated port range forwarding, IPv4, loopback" {
pasta_test_do 4 loopback tcp 2 1 "port" 1
pasta_test_do 4 loopback tcp 3 1 "port" 1
}
@test "podman networking with pasta(1) - Address-bound TCP port forwarding, IPv4, tap" {
@@ -439,7 +439,7 @@ function teardown() {
}
@test "podman networking with pasta(1) - TCP port range forwarding, IPv6, tap" {
pasta_test_do 6 tap tcp 2 0 "port" 1
pasta_test_do 6 tap tcp 3 0 "port" 1
}
@test "podman networking with pasta(1) - TCP port range forwarding, IPv6, loopback" {
@@ -455,11 +455,11 @@ function teardown() {
}
@test "podman networking with pasta(1) - TCP translated port range forwarding, IPv6, tap" {
pasta_test_do 6 tap tcp 2 1 "port" 1
pasta_test_do 6 tap tcp 3 1 "port" 1
}
@test "podman networking with pasta(1) - TCP translated port range forwarding, IPv6, loopback" {
pasta_test_do 6 loopback tcp 2 1 "port" 1
pasta_test_do 6 loopback tcp 3 1 "port" 1
}
@test "podman networking with pasta(1) - Address-bound TCP port forwarding, IPv6, tap" {