From 63ce0b337725708354e958aac86b802c8d7a4d36 Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Wed, 13 Jun 2018 16:42:00 +0100
Subject: [PATCH] Add timeout while waiting for ready in tests

---
 test/docker/devconfig_test_util.go  | 29 ++++++++++++++---------------
 test/docker/docker_api_test_util.go | 16 ++++++++++++----
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/test/docker/devconfig_test_util.go b/test/docker/devconfig_test_util.go
index 2215e92..c89e458 100644
--- a/test/docker/devconfig_test_util.go
+++ b/test/docker/devconfig_test_util.go
@@ -51,23 +51,22 @@ func waitForWebReady(t *testing.T, cli *client.Client, ID string, tlsConfig *tls
 		},
 	}
 	url := fmt.Sprintf("https://localhost:%s/ibmmq/rest/v1/admin/installation", getPort(t, cli, ID, 9443))
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	defer cancel()
+
 	for {
-		req, err := http.NewRequest("GET", url, nil)
-		req.SetBasicAuth("admin", devAdminPassword)
-		resp, err := httpClient.Do(req)
-		if err == nil && resp.StatusCode == http.StatusOK {
-			t.Log("MQ web server is ready")
-			return
+		select {
+		case <-time.After(1 * time.Second):
+			req, err := http.NewRequest("GET", url, nil)
+			req.SetBasicAuth("admin", devAdminPassword)
+			resp, err := httpClient.Do(req.WithContext(ctx))
+			if err == nil && resp.StatusCode == http.StatusOK {
+				t.Log("MQ web server is ready")
+				return
+			}
+		case <-ctx.Done():
+			t.Fatal("Timed out waiting for web server to become ready")
 		}
-		// conn, err := tls.Dial("tcp", a, &config)
-		// if err == nil {
-		// 	conn.Close()
-		// 	// Extra sleep to allow web apps to start
-		// 	time.Sleep(5 * time.Second)
-		// 	t.Log("MQ web server is ready")
-		// 	return
-		// }
-		time.Sleep(1 * time.Second)
 	}
 }
 
diff --git a/test/docker/docker_api_test_util.go b/test/docker/docker_api_test_util.go
index dc3a989..62be807 100644
--- a/test/docker/docker_api_test_util.go
+++ b/test/docker/docker_api_test_util.go
@@ -387,11 +387,19 @@ rerun:
 }
 
 func waitForReady(t *testing.T, cli *client.Client, ID string) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+
 	for {
-		rc, _ := execContainer(t, cli, ID, "mqm", []string{"chkmqready"})
-		if rc == 0 {
-			t.Log("MQ is ready")
-			return
+		select {
+		case <-time.After(1 * time.Second):
+			rc, _ := execContainer(t, cli, ID, "mqm", []string{"chkmqready"})
+			if rc == 0 {
+				t.Log("MQ is ready")
+				return
+			}
+		case <-ctx.Done():
+			t.Fatal("Timed out waiting for container to become ready")
 		}
 	}
 }