From 3662399e807bd740aa05262f8a76924985435693 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Wed, 22 Apr 2015 17:01:27 -0400 Subject: [PATCH] Make PD test skip correctly on local provider --- test/e2e/pd.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/e2e/pd.go b/test/e2e/pd.go index dcab60f3d6b..cdef0e226f2 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -39,6 +39,7 @@ var _ = Describe("PD", func() { podClient client.PodInterface host0Name string host1Name string + numHosts int ) BeforeEach(func() { @@ -50,10 +51,15 @@ var _ = Describe("PD", func() { nodes, err := c.Nodes().List(labels.Everything(), fields.Everything()) expectNoError(err, "Failed to list nodes for e2e cluster.") - Expect(len(nodes.Items) >= 2).To(BeTrue()) - host0Name = nodes.Items[0].ObjectMeta.Name - host1Name = nodes.Items[1].ObjectMeta.Name + numHosts = len(nodes.Items) + + if len(nodes.Items) >= 2 { + host1Name = nodes.Items[1].ObjectMeta.Name + } + if len(nodes.Items) >= 1 { + host0Name = nodes.Items[0].ObjectMeta.Name + } }) It("should schedule a pod w/ a RW PD, remove it, then schedule it on another host", func() { @@ -63,6 +69,8 @@ var _ = Describe("PD", func() { return } + Expect(numHosts >= 2).To(BeTrue(), "At least 2 nodes required") + By("creating PD") diskName, err := createPD() expectNoError(err, "Error creating PD") @@ -120,6 +128,8 @@ var _ = Describe("PD", func() { return } + Expect(numHosts >= 2).To(BeTrue(), "At least 2 nodes required") + By("creating PD") diskName, err := createPD() expectNoError(err, "Error creating PD")