From 009b5356cb27192fc10ddf3830c8d1f2cbe9b518 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Fri, 4 Sep 2020 18:23:31 +0200 Subject: [PATCH 1/2] e2e: node: topomgr: avoid plugin leak on test fail We need to make sure we tear down the sriov device plugin pod should the tests fail, to avoid leaking pods in the test environment. Signed-off-by: Francesco Romani --- test/e2e_node/topology_manager_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/topology_manager_test.go b/test/e2e_node/topology_manager_test.go index 09285f42dad..406fa98b0fc 100644 --- a/test/e2e_node/topology_manager_test.go +++ b/test/e2e_node/topology_manager_test.go @@ -527,6 +527,8 @@ func runTopologyManagerNodeAlignmentSuiteTests(f *framework.Framework, configMap } sd := setupSRIOVConfigOrFail(f, configMap) + defer teardownSRIOVConfigOrFail(f, sd) + envInfo := &testEnvInfo{ numaNodes: numaNodes, sriovResourceName: sd.resourceName, @@ -695,7 +697,6 @@ func runTopologyManagerNodeAlignmentSuiteTests(f *framework.Framework, configMap } runTopologyManagerNegativeTest(f, 1, ctnAttrs, envInfo) } - teardownSRIOVConfigOrFail(f, sd) } func runTopologyManagerTests(f *framework.Framework) { From 82a730f11624e8285adc4cd393b19f8d831d8e80 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Wed, 14 Oct 2020 23:03:17 +0200 Subject: [PATCH 2/2] e2e: topomgr: fix ginkgo log Due to a rebase glitch the fmt.Sprintf() was lost. This patches restores it improving the logs readability. Signed-off-by: Francesco Romani --- test/e2e_node/topology_manager_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e_node/topology_manager_test.go b/test/e2e_node/topology_manager_test.go index 406fa98b0fc..088f46238ad 100644 --- a/test/e2e_node/topology_manager_test.go +++ b/test/e2e_node/topology_manager_test.go @@ -506,7 +506,7 @@ func teardownSRIOVConfigOrFail(f *framework.Framework, sd *sriovData) { GracePeriodSeconds: &gp, } - ginkgo.By("Delete SRIOV device plugin pod %s/%s") + ginkgo.By(fmt.Sprintf("Delete SRIOV device plugin pod %s/%s", sd.pod.Namespace, sd.pod.Name)) err = f.ClientSet.CoreV1().Pods(sd.pod.Namespace).Delete(context.TODO(), sd.pod.Name, deleteOptions) framework.ExpectNoError(err) waitForContainerRemoval(sd.pod.Spec.Containers[0].Name, sd.pod.Name, sd.pod.Namespace)