From f303ad6fb22c81650138972301aa1a32cc801b63 Mon Sep 17 00:00:00 2001 From: Quinton Hoole Date: Fri, 2 Oct 2015 16:30:36 -0700 Subject: [PATCH] Port Node Resize e2e tests to e2e Framework Partially addresses #13503, #13574, #13828 --- test/e2e/resize_nodes.go | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index acec7a32176..dbcd54ab711 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -384,28 +384,17 @@ func performTemporaryNetworkFailure(c *client.Client, ns, rcName string, replica } var _ = Describe("Nodes", func() { + framework := Framework{BaseName: "resize-nodes"} var c *client.Client var ns string BeforeEach(func() { - var err error - c, err = loadClient() - expectNoError(err) - testingNs, err := createTestingNS("resize-nodes", c) - ns = testingNs.Name - Expect(err).NotTo(HaveOccurred()) + framework.beforeEach() + c = framework.Client + ns = framework.Namespace.Name }) - AfterEach(func() { - By("checking whether all nodes are healthy") - if err := allNodesReady(c, time.Minute); err != nil { - Failf("Not all nodes are ready: %v", err) - } - By(fmt.Sprintf("destroying namespace for this suite %s", ns)) - if err := deleteNS(c, ns, 5*time.Minute /* namespace deletion timeout */); err != nil { - Failf("Couldn't delete namespace '%s', %v", ns, err) - } - }) + AfterEach(framework.afterEach) Describe("Resize", func() { var skipped bool