opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18664 from mtrmac/rm-concurrent-flake

Browse Source 
In a concurrent removal test, don't remove concurrently with builds
This commit is contained in:
OpenShift Merge Robot
2023-05-23 16:05:33 -04:00
committed by GitHub
parent c894a12b74 fb8a124905
commit c08ecd6cb3
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/e2e/rmi_test.go
View File

@ -266,22 +266,33 @@ RUN find $LOCAL
podmanTest.AddImageToRWStore(CIRROS_IMAGE)
var wg sync.WaitGroup
buildAndRemove := func(i int) {
defer GinkgoRecover()
defer wg.Done()
imageName := fmt.Sprintf("rmtest:%d", i)
containerfile := fmt.Sprintf(`FROM %s
RUN touch %s`, CIRROS_IMAGE, imageName)
podmanTest.BuildImage(containerfile, imageName, "false")
session := podmanTest.Podman([]string{"rmi", "-f", imageName})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
}
// Prepare images
wg.Add(10)
for i := 0; i < 10; i++ {
go buildAndRemove(i)
go func(i int) {
defer GinkgoRecover()
defer wg.Done()
imageName := fmt.Sprintf("rmtest:%d", i)
containerfile := fmt.Sprintf(`FROM %s
RUN touch %s`, CIRROS_IMAGE, imageName)
podmanTest.BuildImage(containerfile, imageName, "false")
}(i)
}
wg.Wait()
// A herd of concurrent removals
wg.Add(10)
for i := 0; i < 10; i++ {
go func(i int) {
defer GinkgoRecover()
defer wg.Done()
imageName := fmt.Sprintf("rmtest:%d", i)
session := podmanTest.Podman([]string{"rmi", "-f", imageName})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
}(i)
}
wg.Wait()
})