opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 05:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix "podman system prune networks" flake

Browse Source 
Since by default the network config dir is shared in the e2e tests any
other parallel running test could remove a network and cause this test to
fail.

Fixes #15990

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-09-29 14:37:02 +02:00
parent f52feded3c
commit 3b5171d0ee
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/network_test.go
View File

@ -706,7 +706,7 @@ var _ = Describe("Podman network", func() {
}) })
It("podman network prune --filter", 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 podmanTest.NetworkConfigDir = tempdir
if IsRemote() { if IsRemote() {
podmanTest.RestartRemoteService() podmanTest.RestartRemoteService()
@ -754,7 +754,7 @@ var _ = Describe("Podman network", func() {
}) })
It("podman network prune", 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 podmanTest.NetworkConfigDir = tempdir
if IsRemote() { if IsRemote() {
podmanTest.RestartRemoteService() podmanTest.RestartRemoteService()

6
test/e2e/prune_test.go
View File

@ -259,6 +259,12 @@ var _ = Describe("Podman prune", func() {
}) })
It("podman system prune networks", 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. // Create new network.
session := podmanTest.Podman([]string{"network", "create", "test"}) session := podmanTest.Podman([]string{"network", "create", "test"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()