From df923b26138a449a522cbbf22e4adcc630606a60 Mon Sep 17 00:00:00 2001 From: baude Date: Sun, 23 Dec 2018 11:47:46 -0600 Subject: rootless tests using stop is more reliable when testing rootless containers, it is more reliable to stop a container with a zero timeout than kill a container. We made this change in non-rootless tests as well. When IO or CPU are taxed, it avoids a situation where the kill signal is sent but the container has not been able to update its status when a subsequent action occurs. Signed-off-by: baude --- test/e2e/rootless_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go index 5a7f0359a..8e9f9fc8d 100644 --- a/test/e2e/rootless_test.go +++ b/test/e2e/rootless_test.go @@ -210,7 +210,7 @@ var _ = Describe("Podman rootless", func() { cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) - cmd = rootlessTest.PodmanAsUser([]string{"kill", "-l"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"stop", "-l", "-t", "0"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) -- cgit v1.2.3-54-g00ecf