opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 16:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21585 from Luap99/port-range-flake

Browse Source 
fix "podman run port forward range" flake
This commit is contained in:
openshift-merge-bot[bot]
2024-02-09 17:04:32 +00:00
committed by GitHub
parent 3ba674dc36 1ca608ea99
commit abb94397f9
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/system/500-networking.bats
View File

@ -716,7 +716,16 @@ nameserver 8.8.8.8" "nameserver order is correct"
} }
@test "podman run port forward range" { @test "podman run port forward range" {
for netmode in bridge slirp4netns:port_handler=slirp4netns slirp4netns:port_handler=rootlesskit; do # we run a long loop of tests lets run all combinations before bailing out
defer-assertion-failures
# pasta only works rootless
local pasta=
if is_rootless; then
pasta=pasta
fi
for netmode in bridge slirp4netns:port_handler=slirp4netns slirp4netns:port_handler=rootlesskit $pasta; do
local range=$(random_free_port_range 3) local range=$(random_free_port_range 3)
# die() inside $(...) does not actually stop us. # die() inside $(...) does not actually stop us.
assert "$range" != "" "Could not find free port range" assert "$range" != "" "Could not find free port range"
@ -729,10 +738,22 @@ nameserver 8.8.8.8" "nameserver order is correct"
cid="$output" cid="$output"
for port in $(seq $port $end_port); do for port in $(seq $port $end_port); do
run_podman exec -d $cid nc -l -p $port -e /bin/cat run_podman exec -d $cid nc -l -p $port -e /bin/cat
# we have to rety ncat as it can flake as we exec in the background so nc -l
# might not have bound the port yet, retry seems simpler than checking if the
# port is bound in the container, https://github.com/containers/podman/issues/21561.
retries=5
while [[ $retries -gt 0 ]]; do
# -w 1 adds a 1 second timeout. For some reason, ubuntu's ncat # -w 1 adds a 1 second timeout. For some reason, ubuntu's ncat
# doesn't close the connection on EOF, and other options to # doesn't close the connection on EOF, and other options to
# change this are not portable across distros. -w seems to work. # change this are not portable across distros. -w seems to work.
run nc -w 1 127.0.0.1 $port <<<$random run nc -w 1 127.0.0.1 $port <<<$random
if [[ $status -eq 0 ]]; then
break
fi
sleep 0.5
retries=$((retries -1))
done
is "$output" "$random" "ncat got data back (netmode=$netmode port=$port)" is "$output" "$random" "ncat got data back (netmode=$netmode port=$port)"
done done