containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pasta tests: cleanup + 1 new test 

- typo fix, a misspelled variable resulting in test being NOP
- remove unnecessary variable (followup to #19044)
- add opportunistic CONTAINERS_CONF test (followup to #19032)

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2023-06-29 05:22:29 -06:00
parent fad2fa3dac
commit 4da3e47b6f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ function pasta_test_do() {
local xseq="$(echo ${xport} | tr '-' ' ')" local xseq="$(echo ${xport} | tr '-' ' ')"
else else
local port=$(random_free_port "" ${address} ${proto}) local port=$(random_free_port "" ${address} ${proto})
local xport="$((port + port_delta))" local xport="$((port + delta))"
local seq="${port} ${port}" local seq="${port} ${port}"
local xseq="${xport} ${xport}" local xseq="${xport} ${xport}"
fi fi
@ -99,9 +99,6 @@ function pasta_test_do() {
recv="EXEC:md5sum" recv="EXEC:md5sum"
fi fi
# socat first address
send="OPEN:${XFER_FILE}"
# and port forwarding configuration for Podman and pasta. # and port forwarding configuration for Podman and pasta.
# #
# TODO: Use Podman options once/if # TODO: Use Podman options once/if
@ -145,7 +142,7 @@ function pasta_test_do() {
local connect="${proto_upper}${ip_ver}:[${addr}]:${one_port}" local connect="${proto_upper}${ip_ver}:[${addr}]:${one_port}"
[ "${proto}" = "udp" ] && connect="${connect},shut-null" [ "${proto}" = "udp" ] && connect="${connect},shut-null"
(while sleep ${delay} && ! socat -u "${send}" "${connect}"; do : (while sleep ${delay} && ! socat -u "OPEN:${XFER_FILE}" "${connect}"; do :
done) & done) &
done done
@ -700,9 +697,13 @@ function teardown() {
mac="9a:dd:31:ea:92:98" mac="9a:dd:31:ea:92:98"
cat >$containersconf <<EOF cat >$containersconf <<EOF
[network] [network]
default_rootless_network_cmd = "pasta"
pasta_options = ["-I", "myname", "--ns-mac-addr", "$mac"] pasta_options = ["-I", "myname", "--ns-mac-addr", "$mac"]
EOF EOF
CONTAINERS_CONF_OVERRIDE=$containersconf run_podman run --net=pasta $IMAGE ip link show myname
# 2023-06-29 DO NOT INCLUDE "--net=pasta" on this line!
# This tests containers.conf:default_rootless_network_cmd (pr #19032)
CONTAINERS_CONF_OVERRIDE=$containersconf run_podman run $IMAGE ip link show myname
assert "$output" =~ "$mac" "mac address is set on custom interface" assert "$output" =~ "$mac" "mac address is set on custom interface"
# now, again but this time overwrite a option on the cli. # now, again but this time overwrite a option on the cli.