diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-05-16 17:42:23 +0200 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-05-17 10:55:02 +0200 |
| commit | 4462113c5e1d51b2ac6516afb96a9ae83c00254e (patch) | |
| tree | 10727f7d0d237fa4303bc5f0d411a45e5565e882 /test/e2e/network_connect_disconnect_test.go | |
| parent | a6a3df0273d19197286d12a805d7bc34c787b25f (diff) | |
| download | podman-4462113c5e1d51b2ac6516afb96a9ae83c00254e.tar.gz podman-4462113c5e1d51b2ac6516afb96a9ae83c00254e.tar.bz2 podman-4462113c5e1d51b2ac6516afb96a9ae83c00254e.zip | |
podman network reload add rootless support
Allow podman network reload to be run as rootless user. While it is
unlikely that the iptable rules are flushed inside the rootless cni
namespace, it could still happen. Also fix podman network reload --all
to ignore errors when a container does not have the bridge network mode,
e.g. slirp4netns.
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'test/e2e/network_connect_disconnect_test.go')
| -rw-r--r-- | test/e2e/network_connect_disconnect_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 6974c7614..c82aacbe4 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -66,7 +66,7 @@ var _ = Describe("Podman network connect and disconnect", func() { con := podmanTest.Podman([]string{"network", "disconnect", netName, "test"}) con.WaitWithDefaultTimeout() Expect(con.ExitCode()).ToNot(BeZero()) - Expect(con.ErrorToString()).To(ContainSubstring(`network mode "slirp4netns" is not supported`)) + Expect(con.ErrorToString()).To(ContainSubstring(`"slirp4netns" is not supported: invalid network mode`)) }) It("podman network disconnect", func() { @@ -132,7 +132,7 @@ var _ = Describe("Podman network connect and disconnect", func() { con := podmanTest.Podman([]string{"network", "connect", netName, "test"}) con.WaitWithDefaultTimeout() Expect(con.ExitCode()).ToNot(BeZero()) - Expect(con.ErrorToString()).To(ContainSubstring(`network mode "slirp4netns" is not supported`)) + Expect(con.ErrorToString()).To(ContainSubstring(`"slirp4netns" is not supported: invalid network mode`)) }) It("podman connect on a container that already is connected to the network should error", func() { |