From 1c79f0146c424393dc014dfe04b18c4fb2fcc8e1 Mon Sep 17 00:00:00 2001
From: Dennis Adjei-Baah <dennis@buoyant.io>
Date: Fri, 2 Nov 2018 13:30:06 -0700
Subject: [PATCH] add control plane check before running proxy test assertion
 (#1836)

This PR adds a check before the TestCheckProxy executes the CLI command to make sure the control plane has installed all its pods. This avoids the situation where the test would fail because the pods are retrying the data plane check. The PR's base is #1835 but will switch to master once that PR merges.

Relates to PR #1835
Fixes #1733

Signed-off-by: Dennis Adjei-Baah <dennis@buoyant.io>
---
 test/install_test.go | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/test/install_test.go b/test/install_test.go
index 637cf333e..c34629ae6 100644
--- a/test/install_test.go
+++ b/test/install_test.go
@@ -131,7 +131,12 @@ func TestCheckPostInstall(t *testing.T) {
 	var out string
 	var err error
 	overallErr := TestHelper.RetryFor(30*time.Second, func() error {
-		out, _, err = TestHelper.LinkerdRun("check", "--expected-version", TestHelper.GetVersion())
+		out, _, err = TestHelper.LinkerdRun(
+			"check",
+			"--expected-version",
+			TestHelper.GetVersion(),
+			"--wait=0",
+			)
 		return err
 	})
 	if overallErr != nil {
@@ -220,14 +225,21 @@ func TestInject(t *testing.T) {
 
 func TestCheckProxy(t *testing.T) {
 	prefixedNs := TestHelper.GetTestNamespace("smoke-test")
-	out, _, err := TestHelper.LinkerdRun(
-		"check",
-		"--proxy",
-		"--expected-version",
-		TestHelper.GetVersion(),
-		"--namespace",
-		prefixedNs,
-	)
+	var out string
+	err := TestHelper.RetryFor(2*time.Minute, func() error {
+		var err error
+		out, _, err = TestHelper.LinkerdRun(
+			"check",
+			"--proxy",
+			"--expected-version",
+			TestHelper.GetVersion(),
+			"--namespace",
+			prefixedNs,
+			"--wait=0",
+		)
+		return err
+	})
+
 	if err != nil {
 		t.Fatalf("Check command failed\n%s", out)
 	}