Merge pull request #34030 from MrHohn/e2e_service_fix

Automatic merge from submit-queue Improve source ip preservation test, fail the test instead of panic. From #31085. The source IP preserve test starts to be flake again. Sending out this PR to get rid of panicing and log the unexpected output for future investigation. @freehan

Merge pull request #34030 from MrHohn/e2e_service_fix
6b827928 · Kubernetes Submit Queue · GitHub · 0b048906 · 0d500921 · 6b827928
Commit 6b827928 authored Oct 05, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

service.go test/e2e/service.go +6 -3

No files found.
--- a/test/e2e/service.go
+++ b/test/e2e/service.go
@@ -2347,7 +2347,10 @@ func execSourceipTest(f *framework.Framework, c *client.Client, ns, nodeName, se
 	// the stdout return from RunHostCmd seems to come with "\n", so TrimSpace is needed
 	// desired stdout in this format: client_address=x.x.x.x
 	outputs := strings.Split(strings.TrimSpace(stdout), "=")
-	sourceIp := outputs[1]
-
-	return execPodIp, sourceIp
+	if len(outputs) != 2 {
+		// fail the test if output format is unexpected
+		framework.Failf("exec pod returned unexpected stdout format: [%v]\n", stdout)
+		return execPodIp, ""
+	}
+	return execPodIp, outputs[1]
 }