opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19044 from dgibson/bug17287

Browse Source 
Correct intermittent failures in pasta port range forwarding tests
This commit is contained in:
OpenShift Merge Robot
2023-06-29 13:04:39 +02:00
committed by GitHub
parent 62399c77be e4efd709d9
commit 8ff12e09f0
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/system/505-networking-pasta.bats
View File

@ -105,12 +105,8 @@ function pasta_test_do() {
recv="EXEC:md5sum"
fi
# socat options for first <address> in client ("OPEN" or "EXEC"),
if [ "${bytes}" = "1" ]; then
send="EXEC:printf x"
else
send="OPEN:${XFER_FILE}"
fi
# socat first address
send="OPEN:${XFER_FILE}"
# and port forwarding configuration for Podman and pasta.
#
@ -136,6 +132,7 @@ function pasta_test_do() {
dd if=/dev/urandom bs=${bytes} count=1 of="${XFER_FILE}"
local expect="$(cat "${XFER_FILE}" | md5sum)"
else
printf "x" > "${XFER_FILE}"
local expect="$(for i in $(seq ${seq}); do printf "x"; done)"
fi
@ -392,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" {
@ -408,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" {
@ -442,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" {
@ -458,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" {