opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-18 10:08:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Luap99/flake-15990

Browse Source 
fix "podman system prune networks" flake
This commit is contained in:
OpenShift Merge Robot
2022-09-29 18:30:27 +02:00
committed by GitHub
parent 42903b785c 3b5171d0ee
commit 472e8243e5
2 changed files with 8 additions and 2 deletions

4
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()

6
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()