github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15022 from quinton-hoole/2015-09-29-namespace-is-active-error

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-05 22:55:37 -07:00
commit 5ef529fa10
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/scheduler_predicates.go
View File

@ -136,30 +136,17 @@ func cleanupPods(c *client.Client, ns string) {
} }
var _ = Describe("SchedulerPredicates", func() { var _ = Describe("SchedulerPredicates", func() {
framework := Framework{BaseName: "sched-pred"}
var c *client.Client var c *client.Client
var nodeList *api.NodeList var nodeList *api.NodeList
var nodeCount int
var totalPodCapacity int64 var totalPodCapacity int64
var RCName string var RCName string
var ns string var ns string
var uuid string
BeforeEach(func() { BeforeEach(func() {
var err error framework.beforeEach()
c, err = loadClient() c = framework.Client
expectNoError(err) ns = framework.Namespace.Name
nodeList, err = c.Nodes().List(labels.Everything(), fields.Everything())
expectNoError(err)
nodeCount = len(nodeList.Items)
Expect(nodeCount).NotTo(BeZero())
err = checkTestingNSDeletedExcept(c, "")
expectNoError(err)
nsForTesting, err := createTestingNS("sched-pred", c)
ns = nsForTesting.Name
expectNoError(err)
uuid = string(util.NewUUID())
}) })
AfterEach(func() { AfterEach(func() {
@ -169,11 +156,7 @@ var _ = Describe("SchedulerPredicates", func() {
err := DeleteRC(c, ns, RCName) err := DeleteRC(c, ns, RCName)
expectNoError(err) expectNoError(err)
} }
framework.afterEach()
By(fmt.Sprintf("Destroying namespace for this suite %v", ns))
if err := deleteNS(c, ns, 10*time.Minute /* namespace deletion timeout */); err != nil {
Failf("Couldn't delete ns %s", err)
}
}) })
// This test verifies that max-pods flag works as advertised. It assumes that cluster add-on pods stay stable // This test verifies that max-pods flag works as advertised. It assumes that cluster add-on pods stay stable