summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-04 14:51:32 +0200
committerGitHub <noreply@github.com>2019-06-04 14:51:32 +0200
commit67c50ab63ddf0628d95797600fe85e27e24d4f87 (patch)
treef05950ba291b693728d817d67708c0ab679e4b2e
parentdb1e42246145acd03075d839b8fc6bfc3b8fb18d (diff)
parentc727cd1dc6fd83e9bc40865e2acab0d6966bb3ce (diff)
downloadpodman-67c50ab63ddf0628d95797600fe85e27e24d4f87.tar.gz
podman-67c50ab63ddf0628d95797600fe85e27e24d4f87.tar.bz2
podman-67c50ab63ddf0628d95797600fe85e27e24d4f87.zip
Merge pull request #3249 from baude/testtiming
fix timing issues with some tests
-rw-r--r--test/e2e/healthcheck_run_test.go17
1 files changed, 14 insertions, 3 deletions
diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go
index be54cf1bd..2af427d28 100644
--- a/test/e2e/healthcheck_run_test.go
+++ b/test/e2e/healthcheck_run_test.go
@@ -5,6 +5,7 @@ package integration
import (
"fmt"
"os"
+ "time"
. "github.com/containers/libpod/test/utils"
. "github.com/onsi/ginkgo"
@@ -47,9 +48,19 @@ var _ = Describe("Podman healthcheck run", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- hc := podmanTest.Podman([]string{"healthcheck", "run", "hc"})
- hc.WaitWithDefaultTimeout()
- Expect(hc.ExitCode()).To(Equal(0))
+ exitCode := 999
+
+ // Buy a little time to get container running
+ for i := 0; i < 5; i++ {
+ hc := podmanTest.Podman([]string{"healthcheck", "run", "hc"})
+ hc.WaitWithDefaultTimeout()
+ exitCode = hc.ExitCode()
+ if exitCode == 0 || i == 4 {
+ break
+ }
+ time.Sleep(1 * time.Second)
+ }
+ Expect(exitCode).To(Equal(0))
})
It("podman healthcheck that should fail", func() {