Merge pull request #37006 from jayunit100/skip_dont_fail

Automatic merge from submit-queue Skip rather than fail networking tests on single node **What this PR does / why we need it**: Needed for the general e2e tidying we need to do for flakey slow tests, imo pre 1.5, see #31402 and so on. **Which issue this PR fixes** * Dont fail multinode tests if on a single node cluster, skip instead.

Merge pull request #37006 from jayunit100/skip_dont_fail
50fb2845 · Kubernetes Submit Queue · GitHub · ef079a31 · ec2c9632 · 50fb2845
Commit 50fb2845 authored Nov 30, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

networking_utils.go test/e2e/framework/networking_utils.go +1 -1

No files found.
--- a/test/e2e/framework/networking_utils.go
+++ b/test/e2e/framework/networking_utils.go
@@ -473,7 +473,7 @@ func (config *NetworkingTestConfig) setup(selector map[string]string) {
 		// fall back to legacy IPs
 		config.ExternalAddrs = NodeAddresses(nodeList, v1.NodeLegacyHostIP)
 	}
-	Expect(len(config.ExternalAddrs)).To(BeNumerically(">=", 2), fmt.Sprintf("At least two nodes necessary with an external or LegacyHostIP"))
+	SkipUnlessNodeCountIsAtLeast(2)
 	config.Nodes = nodeList.Items

 	By("Creating the service on top of the pods in kubernetes")