Consolidate node selecting tests to only use Schedulable + Running

nodes.
This commit is contained in:
Jay Vyas
2016-05-05 16:56:25 -04:00
parent 32256d53aa
commit 326b213231
21 changed files with 44 additions and 51 deletions

View File

@@ -73,7 +73,7 @@ var _ = framework.KubeDescribe("NodeOutOfDisk [Serial] [Flaky] [Disruptive]", fu
BeforeEach(func() {
c = f.Client
nodelist := framework.ListSchedulableNodesOrDie(c)
nodelist := framework.GetReadySchedulableNodesOrDie(c)
// Skip this test on small clusters. No need to fail since it is not a use
// case that any cluster of small size needs to support.
@@ -87,7 +87,7 @@ var _ = framework.KubeDescribe("NodeOutOfDisk [Serial] [Flaky] [Disruptive]", fu
AfterEach(func() {
nodelist := framework.ListSchedulableNodesOrDie(c)
nodelist := framework.GetReadySchedulableNodesOrDie(c)
Expect(len(nodelist.Items)).ToNot(BeZero())
for _, node := range nodelist.Items {
if unfilledNodeName == node.Name || recoveredNodeName == node.Name {
@@ -150,7 +150,7 @@ var _ = framework.KubeDescribe("NodeOutOfDisk [Serial] [Flaky] [Disruptive]", fu
}
})
nodelist := framework.ListSchedulableNodesOrDie(c)
nodelist := framework.GetReadySchedulableNodesOrDie(c)
Expect(len(nodelist.Items)).To(BeNumerically(">", 1))
nodeToRecover := nodelist.Items[1]