Merge pull request #37235 from bowei/flake-37114

Automatic merge from submit-queue Test flake: ignore dig failure; wait until timeout The intent of this test was to continue trying until the timeout has been reached. The extra assertion makes the test fail early when it should not. https://github.com/kubernetes/kubernetes/issues/37144 fix 37114

Merge pull request #37235 from bowei/flake-37114
9a600f62 · Kubernetes Submit Queue · GitHub · 4dd0320d · 5b2c0075 · 9a600f62
Commit 9a600f62 authored Nov 21, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

dns_configmap.go test/e2e/dns_configmap.go +2 -4

No files found.
--- a/test/e2e/dns_configmap.go
+++ b/test/e2e/dns_configmap.go
@@ -200,10 +200,8 @@ func (t *dnsConfigMapTest) runDig(dnsName string) []string {
 		CaptureStderr: true,
 	})

-	Expect(err).NotTo(HaveOccurred())
-
-	framework.Logf("Running dig: %v, stdout: %q, stderr: %q",
-		cmd, stdout, stderr)
+	framework.Logf("Running dig: %v, stdout: %q, stderr: %q, err: %v",
+		cmd, stdout, stderr, err)

 	if stdout == "" {
 		return []string{}