summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2019-05-03 09:53:26 -0700
committerShentubot <shentubot@google.com>2019-05-03 09:54:24 -0700
commit95614bbefa2f4657c77b2040630088fdec7f5dd1 (patch)
tree2a91f4a60d59226cc21542ffc9bd373c76aaf86c
parent6b9ab65163528239c9fbf10053427513513e6ab0 (diff)
Increase timeout to wait for port to become available
TestHttpd fails sporadically waiting for the port on slow machines. PiperOrigin-RevId: 246525277 Change-Id: Ie0ea71e3c4664d24f580eabd8f7461e47079f734
-rw-r--r--runsc/test/image/image_test.go4
-rw-r--r--runsc/test/integration/integration_test.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/runsc/test/image/image_test.go b/runsc/test/image/image_test.go
index 0c45602f9..8322dd001 100644
--- a/runsc/test/image/image_test.go
+++ b/runsc/test/image/image_test.go
@@ -103,7 +103,7 @@ func TestHttpd(t *testing.T) {
}
// Wait until it's up and running.
- if err := testutil.WaitForHTTP(port, 5*time.Second); err != nil {
+ if err := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
t.Fatalf("WaitForHTTP() timeout: %v", err)
}
@@ -137,7 +137,7 @@ func TestNginx(t *testing.T) {
}
// Wait until it's up and running.
- if err := testutil.WaitForHTTP(port, 5*time.Second); err != nil {
+ if err := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
t.Fatalf("WaitForHTTP() timeout: %v", err)
}
diff --git a/runsc/test/integration/integration_test.go b/runsc/test/integration/integration_test.go
index b2e86aacc..842f05545 100644
--- a/runsc/test/integration/integration_test.go
+++ b/runsc/test/integration/integration_test.go
@@ -68,7 +68,7 @@ func TestLifeCycle(t *testing.T) {
if err != nil {
t.Fatal("docker.FindPort(80) failed: ", err)
}
- if err := testutil.WaitForHTTP(port, 5*time.Second); err != nil {
+ if err := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
t.Fatal("WaitForHTTP() timeout:", err)
}
client := http.Client{Timeout: time.Duration(2 * time.Second)}