From 27de152b5a1f6226a02a23fae36ff2dde9e271db Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Tue, 9 Nov 2021 16:25:24 +0100
Subject: network reload without ports should not reload ports

When run as rootless the podman network reload command tries to reload
the rootlessport ports because the childIP could have changed.
However if the containers has no ports we should skip this instead of
printing a warning.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 test/e2e/network_connect_disconnect_test.go | 2 ++
 test/system/500-networking.bats             | 9 +++++++++
 2 files changed, 11 insertions(+)

(limited to 'test')

diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go
index 6cddf9285..2205a1263 100644
--- a/test/e2e/network_connect_disconnect_test.go
+++ b/test/e2e/network_connect_disconnect_test.go
@@ -87,6 +87,7 @@ var _ = Describe("Podman network connect and disconnect", func() {
 		dis := podmanTest.Podman([]string{"network", "disconnect", netName, "test"})
 		dis.WaitWithDefaultTimeout()
 		Expect(dis).Should(Exit(0))
+		Expect(dis.ErrorToString()).Should(Equal(""))
 
 		inspect := podmanTest.Podman([]string{"container", "inspect", "test", "--format", "{{len .NetworkSettings.Networks}}"})
 		inspect.WaitWithDefaultTimeout()
@@ -183,6 +184,7 @@ var _ = Describe("Podman network connect and disconnect", func() {
 		connect := podmanTest.Podman([]string{"network", "connect", newNetName, "test"})
 		connect.WaitWithDefaultTimeout()
 		Expect(connect).Should(Exit(0))
+		Expect(connect.ErrorToString()).Should(Equal(""))
 
 		inspect := podmanTest.Podman([]string{"container", "inspect", "test", "--format", "{{len .NetworkSettings.Networks}}"})
 		inspect.WaitWithDefaultTimeout()
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 7697195ce..21350ed36 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -430,6 +430,7 @@ load helpers
     is "$output" "[${cid:0:12}]" "short container id in network aliases"
 
     run_podman network disconnect $netname $cid
+    is "$output" "" "Output should be empty (no errors)"
 
     # check that we cannot curl (timeout after 3 sec)
     run curl --max-time 3 -s $SERVER/index.txt
@@ -438,6 +439,7 @@ load helpers
     fi
 
     run_podman network connect $netname $cid
+    is "$output" "" "Output should be empty (no errors)"
 
     # curl should work again
     run curl --max-time 3 -s $SERVER/index.txt
@@ -454,6 +456,12 @@ load helpers
         die "MAC address did not change after podman network disconnect/connect"
     fi
 
+    # Disconnect/reconnect of a container *with no ports* should succeed quietly
+    run_podman network disconnect $netname $background_cid
+    is "$output" "" "disconnect of container with no open ports"
+    run_podman network connect $netname $background_cid
+    is "$output" "" "(re)connect of container with no open ports"
+
     # FIXME FIXME FIXME: #11825: bodhi tests are failing, remote+rootless only,
     # with "dnsmasq: failed to create inotify". This error has never occurred
     # in CI, and Ed has been unable to reproduce it on 1minutetip. This next
@@ -464,6 +472,7 @@ load helpers
 
     # connect a second network
     run_podman network connect $netname2 $cid
+    is "$output" "" "Output should be empty (no errors)"
 
     # check network2 alias for container short id
     run_podman inspect $cid --format "{{(index .NetworkSettings.Networks \"$netname2\").Aliases}}"
-- 
cgit v1.2.3-54-g00ecf