Merge pull request #7191 from pmorie/e2e-local

Make PD test skip correctly on local provider
This commit is contained in:
Robert Bailey 2015-04-23 12:08:08 -07:00
commit 09c0f25c86

View File

@ -39,6 +39,7 @@ var _ = Describe("PD", func() {
podClient client.PodInterface podClient client.PodInterface
host0Name string host0Name string
host1Name string host1Name string
numHosts int
) )
BeforeEach(func() { BeforeEach(func() {
@ -50,10 +51,15 @@ var _ = Describe("PD", func() {
nodes, err := c.Nodes().List(labels.Everything(), fields.Everything()) nodes, err := c.Nodes().List(labels.Everything(), fields.Everything())
expectNoError(err, "Failed to list nodes for e2e cluster.") expectNoError(err, "Failed to list nodes for e2e cluster.")
Expect(len(nodes.Items) >= 2).To(BeTrue())
host0Name = nodes.Items[0].ObjectMeta.Name numHosts = len(nodes.Items)
host1Name = nodes.Items[1].ObjectMeta.Name
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() { 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 return
} }
Expect(numHosts >= 2).To(BeTrue(), "At least 2 nodes required")
By("creating PD") By("creating PD")
diskName, err := createPD() diskName, err := createPD()
expectNoError(err, "Error creating PD") expectNoError(err, "Error creating PD")
@ -120,6 +128,8 @@ var _ = Describe("PD", func() {
return return
} }
Expect(numHosts >= 2).To(BeTrue(), "At least 2 nodes required")
By("creating PD") By("creating PD")
diskName, err := createPD() diskName, err := createPD()
expectNoError(err, "Error creating PD") expectNoError(err, "Error creating PD")