From aca03a409023d453d68a9b4c51cd695c73c6b8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Thu, 21 Jul 2022 19:43:55 +0200 Subject: [PATCH] Cleanup no longer used Create/Delete TestingNamespace --- test/integration/framework/util.go | 22 ---------------------- test/integration/util/util.go | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/test/integration/framework/util.go b/test/integration/framework/util.go index db8da91d64c..4bdbb4b6bcc 100644 --- a/test/integration/framework/util.go +++ b/test/integration/framework/util.go @@ -44,28 +44,6 @@ const ( singleCallTimeout = 5 * time.Minute ) -// CreateTestingNamespace creates a namespace for testing. -func CreateTestingNamespace(baseName string, t *testing.T) *v1.Namespace { - // TODO: Create a namespace with a given basename. - // Currently we neither create the namespace nor delete all of its contents at the end. - // But as long as tests are not using the same namespaces, this should work fine. - // Note: As the integration tests do not run with admission turned on, it's not actually - // required to persist a Namespace object to create other objects inside of it. - return &v1.Namespace{ - ObjectMeta: metav1.ObjectMeta{ - // TODO: Once we start creating namespaces, switch to GenerateName. - Name: baseName, - }, - } -} - -// DeleteTestingNamespace is currently a no-op function. -func DeleteTestingNamespace(ns *v1.Namespace, t *testing.T) { - // TODO: Remove all resources from a given namespace once we implement CreateTestingNamespace. - // Note: integration tests are not expected to run against persistent fixtures today, so not - // cleaning up data they create has no impact. -} - // CreateNamespaceOrDie creates a namespace. func CreateNamespaceOrDie(c clientset.Interface, baseName string, t *testing.T) *v1.Namespace { ns := &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: baseName}} diff --git a/test/integration/util/util.go b/test/integration/util/util.go index 27dfbd37a16..6189367bb87 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -213,7 +213,7 @@ func CleanupTest(t *testing.T, testCtx *TestContext) { testCtx.CancelFn() // Cleanup nodes. testCtx.ClientSet.CoreV1().Nodes().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{}) - framework.DeleteTestingNamespace(testCtx.NS, t) + framework.DeleteNamespaceOrDie(testCtx.ClientSet, testCtx.NS, t) testCtx.CloseFn() }