Merge pull request #16008 from ixdy/e2e

Auto commit by PR queue bot

test/e2e/daemon_restart.go

@@ -246,9 +246,9 @@ var _ = Describe("DaemonRestart", func() {
 	})
 
 	AfterEach(func() {
+		defer framework.afterEach()
 		close(stopCh)
 		expectNoError(DeleteRC(framework.Client, ns, rcName))
-		framework.afterEach()
 	})
 
 	It("Controller Manager should not create/delete replicas across restart", func() {

test/e2e/daemon_set.go

@@ -65,9 +65,9 @@ var _ = Describe("Daemon set", func() {
 	})
 
 	AfterEach(func() {
+		defer f.afterEach()
 		err := clearDaemonSetNodeLabels(f.Client)
 		Expect(err).NotTo(HaveOccurred())
-		f.afterEach()
 	})
 
 	It("should run and stop simple daemon", func() {

test/e2e/latency.go

@@ -80,6 +80,7 @@ var _ = Describe("[Performance Suite] Latency", func() {
 	})
 
 	AfterEach(func() {
+		defer framework.afterEach()
 		By("Removing additional pods if any")
 		for i := 1; i <= nodeCount; i++ {
 			name := additionalPodsPrefix + "-" + strconv.Itoa(i)

test/e2e/scheduler_predicates.go

@@ -176,13 +176,13 @@ var _ = Describe("SchedulerPredicates", func() {
 	})
 
 	AfterEach(func() {
+		defer framework.afterEach()
 		rc, err := c.ReplicationControllers(ns).Get(RCName)
 		if err == nil && rc.Spec.Replicas != 0 {
 			By("Cleaning up the replication controller")
 			err := DeleteRC(c, ns, RCName)
 			expectNoError(err)
 		}
-		framework.afterEach()
 	})
 
 	// This test verifies that max-pods flag works as advertised. It assumes that cluster add-on pods stay stable