Merge pull request #18509 from gmarek/fix-e2e-pd

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-17 02:06:23 -08:00
26 changed files with 67 additions and 101 deletions

View File

@@ -53,9 +53,7 @@ var _ = Describe("Pod Disks", func() {
SkipUnlessNodeCountIsAtLeast(2)
podClient = framework.Client.Pods(framework.Namespace.Name)
nodes, err := framework.Client.Nodes().List(api.ListOptions{})
expectNoError(err, "Failed to list nodes for e2e cluster.")
nodes := ListSchedulableNodesOrDie(framework.Client)
Expect(len(nodes.Items)).To(BeNumerically(">=", 2), "Requires at least 2 nodes")