Merge pull request #34053 from bprashanth/trim_string

Automatic merge from submit-queue Check for empty string post trimming We curl in a retry loop and timeout, trimming stdout to find endpoint names. When curl hits the timeout, stdout is empty, so we insert the empty string into the received set of endpoints. Fixes https://github.com/kubernetes/kubernetes/issues/32684

Merge pull request #34053 from bprashanth/trim_string
0331b27f · Kubernetes Submit Queue · GitHub · 33103e57 · fd9b152f · 0331b27f
Commit 0331b27f authored Oct 05, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

networking_utils.go test/e2e/networking_utils.go +8 -2

No files found.
--- a/test/e2e/networking_utils.go
+++ b/test/e2e/networking_utils.go
@@ -170,7 +170,10 @@ func (config *NetworkingTestConfig) dialFromContainer(protocol, containerIP, tar
 				continue
 			}
 			for _, hostName := range output["responses"] {
-				eps.Insert(hostName)
+				trimmed := strings.TrimSpace(hostName)
+				if trimmed != "" {
+					eps.Insert(trimmed)
+				}
 			}
 		}
 		framework.Logf("Waiting for endpoints: %v", expectedEps.Difference(eps))
@@ -217,7 +220,10 @@ func (config *NetworkingTestConfig) dialFromNode(protocol, targetIP string, targ
 			// we confirm unreachability.
 			framework.Logf("Failed to execute %v: %v", filterCmd, err)
 		} else {
-			eps.Insert(strings.TrimSpace(stdout))
+			trimmed := strings.TrimSpace(stdout)
+			if trimmed != "" {
+				eps.Insert(trimmed)
+			}
 		}
 		framework.Logf("Waiting for %+v endpoints, got endpoints %+v", expectedEps.Difference(eps), eps)