diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-29 18:30:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 18:30:27 +0200 |
| commit | 472e8243e57f6ea305f8e185e9f4759760b538f8 (patch) | |
| tree | 02e4bc85a44edb457e1cd442d96e2a94e9a20689 | |
| parent | 42903b785cb8476d87b7306860e1f2a1003c1662 (diff) | |
| parent | 3b5171d0ee699059e6f5108e7135c4d3a14fbb66 (diff) | |
| download | podman-472e8243e57f6ea305f8e185e9f4759760b538f8.tar.gz podman-472e8243e57f6ea305f8e185e9f4759760b538f8.tar.bz2 podman-472e8243e57f6ea305f8e185e9f4759760b538f8.zip | |
Merge pull request #15994 from Luap99/flake-15990
fix "podman system prune networks" flake
| -rw-r--r-- | test/e2e/network_test.go | 4 | ||||
| -rw-r--r-- | test/e2e/prune_test.go | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index b2f50ca55..4366d84aa 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -706,7 +706,7 @@ var _ = Describe("Podman network", func() { }) It("podman network prune --filter", func() { - // set custom cni directory to prevent flakes + // set custom network directory to prevent flakes since the dir is shared with all tests by default podmanTest.NetworkConfigDir = tempdir if IsRemote() { podmanTest.RestartRemoteService() @@ -754,7 +754,7 @@ var _ = Describe("Podman network", func() { }) It("podman network prune", func() { - // set custom cni directory to prevent flakes + // set custom network directory to prevent flakes since the dir is shared with all tests by default podmanTest.NetworkConfigDir = tempdir if IsRemote() { podmanTest.RestartRemoteService() diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 0b1d68aea..e91569231 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -259,6 +259,12 @@ var _ = Describe("Podman prune", func() { }) It("podman system prune networks", func() { + // set custom network directory to prevent flakes since the dir is shared with all tests by default + podmanTest.NetworkConfigDir = tempdir + if IsRemote() { + podmanTest.RestartRemoteService() + } + // Create new network. session := podmanTest.Podman([]string{"network", "create", "test"}) session.WaitWithDefaultTimeout() |