containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21011 from edsantiago/wait_wait_wait 

CI: safer podman-stop tests
This commit is contained in:
openshift-merge-bot[bot] 2023-12-15 20:31:38 +00:00 committed by GitHub
parent 2258329769 1c59a9ced1
commit d1d38b2aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/common_test.go
View File

@ -508,8 +508,17 @@ func (p *PodmanTestIntegration) RunTopContainerWithArgs(name string, args []stri
podmanArgs = append(podmanArgs, "--name", name) podmanArgs = append(podmanArgs, "--name", name)
} }
podmanArgs = append(podmanArgs, args...) podmanArgs = append(podmanArgs, args...)
podmanArgs = append(podmanArgs, "-d", ALPINE, "top") podmanArgs = append(podmanArgs, "-d", ALPINE, "top", "-b")
return p.Podman(podmanArgs) session := p.Podman(podmanArgs)
session.WaitWithDefaultTimeout()
Expect(session).To(ExitCleanly())
cid := session.OutputToString()
// Output indicates that top is running, which means it's safe
// for our caller to invoke `podman stop`
if !WaitContainerReady(p, cid, "Mem:", 20, 1) {
Fail("Could not start a top container")
}
return session
} }
// RunLsContainer runs a simple container in the background that // RunLsContainer runs a simple container in the background that

9
test/e2e/prune_test.go
View File

@ -220,8 +220,7 @@ var _ = Describe("Podman prune", func() {
session = podmanTest.Podman([]string{"pod", "start", podid1}) session = podmanTest.Podman([]string{"pod", "start", podid1})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
session = podmanTest.Podman([]string{"pod", "stop", "-t0", podid1})
session = podmanTest.Podman([]string{"pod", "stop", podid1})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
@ -294,8 +293,7 @@ var _ = Describe("Podman prune", func() {
session = podmanTest.Podman([]string{"pod", "start", podid1}) session = podmanTest.Podman([]string{"pod", "start", podid1})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
session = podmanTest.Podman([]string{"pod", "stop", "-t0", podid1})
session = podmanTest.Podman([]string{"pod", "stop", podid1})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
@ -327,8 +325,7 @@ var _ = Describe("Podman prune", func() {
session = podmanTest.Podman([]string{"pod", "start", podid1}) session = podmanTest.Podman([]string{"pod", "start", podid1})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
session = podmanTest.Podman([]string{"pod", "stop", "-t0", podid1})
session = podmanTest.Podman([]string{"pod", "stop", podid1})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())

3
test/system/050-stop.bats
View File

@ -77,12 +77,15 @@ load helpers
# stop -a must print the IDs # stop -a must print the IDs
run_podman run -d $IMAGE top run_podman run -d $IMAGE top
ctrID="$output" ctrID="$output"
# Output means container has set up its signal handlers
wait_for_output "Mem:" $ctrID
run_podman stop --all run_podman stop --all
is "$output" "$ctrID" is "$output" "$ctrID"
# stop $input must print $input # stop $input must print $input
cname=$(random_string) cname=$(random_string)
run_podman run -d --name $cname $IMAGE top run_podman run -d --name $cname $IMAGE top
wait_for_output "Mem:" $cname
run_podman stop $cname run_podman stop $cname
is "$output" $cname is "$output" $cname