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

test/e2e/scheduler_predicates.go

@@ -136,30 +136,17 @@ func cleanupPods(c *client.Client, ns string) {
 }
 
 var _ = Describe("SchedulerPredicates", func() {
+	framework := Framework{BaseName: "sched-pred"}
 	var c *client.Client
 	var nodeList *api.NodeList
-	var nodeCount int
 	var totalPodCapacity int64
 	var RCName string
 	var ns string
-	var uuid string
 
 	BeforeEach(func() {
-		var err error
-		c, err = loadClient()
-		expectNoError(err)
-		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())
+		framework.beforeEach()
+		c = framework.Client
+		ns = framework.Namespace.Name
 	})
 
 	AfterEach(func() {
@@ -169,11 +156,7 @@ var _ = Describe("SchedulerPredicates", func() {
 			err := DeleteRC(c, ns, RCName)
 			expectNoError(err)
 		}
-
-		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)
-		}
+		framework.afterEach()
 	})
 
 	// This test verifies that max-pods flag works as advertised. It assumes that cluster add-on pods stay stable