Merge pull request #23879 from Luap99/prune-flake

test/e2e: fix network prune flake
This commit is contained in:
openshift-merge-bot[bot] 2024-09-05 18:34:16 +00:00 committed by GitHub
commit 858b25df27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions

View File

@ -1410,6 +1410,9 @@ func WaitForService(address url.URL) {
// This needs to be called for all test they may remove networks from other tests,
// so netwokr prune, system prune, or system reset.
// see https://github.com/containers/podman/issues/17946
// Note that when using this and running containers with custom networks you must use the
// ginkgo Serial decorator to ensure no parallel test are running otherwise we get flakes,
// https://github.com/containers/podman/issues/23876
func useCustomNetworkDir(podmanTest *PodmanTestIntegration, tempdir string) {
// set custom network directory to prevent flakes since the dir is shared with all tests by default
podmanTest.NetworkConfigDir = tempdir

View File

@ -695,7 +695,7 @@ var _ = Describe("Podman network", func() {
Expect(listAgain.OutputToStringArray()).Should(ContainElement("podman"))
})
It("podman network prune", func() {
It("podman network prune", Serial, func() {
useCustomNetworkDir(podmanTest, tempdir)
// Create two networks
// Check they are there