From 4da3e47b6f25b2d3fb11f934a8294c33b2a1d521 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Thu, 29 Jun 2023 05:22:29 -0600
Subject: [PATCH] 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>
---
 test/system/505-networking-pasta.bats | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/system/505-networking-pasta.bats b/test/system/505-networking-pasta.bats
index e3f0e97f8a..1f0ccea20e 100644
--- a/test/system/505-networking-pasta.bats
+++ b/test/system/505-networking-pasta.bats
@@ -75,7 +75,7 @@ function pasta_test_do() {
         local xseq="$(echo ${xport} | tr '-' ' ')"
     else
         local port=$(random_free_port "" ${address} ${proto})
-        local xport="$((port + port_delta))"
+        local xport="$((port + delta))"
         local seq="${port} ${port}"
         local xseq="${xport} ${xport}"
     fi
@@ -99,9 +99,6 @@ function pasta_test_do() {
         recv="EXEC:md5sum"
     fi
 
-    # socat first address
-    send="OPEN:${XFER_FILE}"
-
     # and port forwarding configuration for Podman and pasta.
     #
     # TODO: Use Podman options once/if
@@ -145,7 +142,7 @@ function pasta_test_do() {
         local connect="${proto_upper}${ip_ver}:[${addr}]:${one_port}"
         [ "${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
 
@@ -700,9 +697,13 @@ function teardown() {
     mac="9a:dd:31:ea:92:98"
     cat >$containersconf <<EOF
 [network]
+default_rootless_network_cmd = "pasta"
 pasta_options = ["-I", "myname", "--ns-mac-addr", "$mac"]
 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"
 
     # now, again but this time overwrite a option on the cli.