Merge pull request #38270 from resouer/fix-zone

Automatic merge from submit-queue (batch tested with PRs 39394, 38270, 39473, 39516, 36243) Fix wrong skipf parameter **How to reproduce** When run e2e test, it reports `%!!(MISSING)d(MISSING)`: ``` STEP: Checking for multi-zone cluster. Zone count = 1 Dec 6 14:16:43.272: INFO: Zone count is %!!(MISSING)d(MISSING), only run for multi-zone clusters, skipping test [AfterEach] [k8s.io] Multi-AZ Clusters ``` We need to pass a string parameter to `SkipUnlessAtLeast`

Merge pull request #38270 from resouer/fix-zone
125bf9c1 · Kubernetes Submit Queue · GitHub · 73d36ce5 · 993a99dc · 125bf9c1
Commit 125bf9c1 authored Jan 09, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ubernetes_lite.go test/e2e/ubernetes_lite.go +2 -1

No files found.
--- a/test/e2e/ubernetes_lite.go
+++ b/test/e2e/ubernetes_lite.go
@@ -45,7 +45,8 @@ var _ = framework.KubeDescribe("Multi-AZ Clusters", func() {
 			Expect(err).NotTo(HaveOccurred())
 		}
 		By(fmt.Sprintf("Checking for multi-zone cluster.  Zone count = %d", zoneCount))
-		framework.SkipUnlessAtLeast(zoneCount, 2, "Zone count is %d, only run for multi-zone clusters, skipping test")
+		msg := fmt.Sprintf("Zone count is %d, only run for multi-zone clusters, skipping test", zoneCount)
+		framework.SkipUnlessAtLeast(zoneCount, 2, msg)
 		// TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread
 	})
 	It("should spread the pods of a service across zones", func() {