From f635d43002d094438421dd67dfac956519394b74 Mon Sep 17 00:00:00 2001
From: phala <phala@redhat.com>
Date: Tue, 7 May 2024 12:48:06 +0200
Subject: [PATCH] Remove skip_cleanup as it was never fully working

---
 config/settings.local.yaml.tpl                          | 1 -
 config/settings.yaml                                    | 1 -
 testsuite/tests/conftest.py                             | 3 ---
 testsuite/tests/kuadrant/authorino/dinosaur/conftest.py | 4 +---
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/config/settings.local.yaml.tpl b/config/settings.local.yaml.tpl
index fcaa3e57..303a2a58 100644
--- a/config/settings.local.yaml.tpl
+++ b/config/settings.local.yaml.tpl
@@ -1,5 +1,4 @@
 #default:
-#  skip_cleanup: false
 #  tester: "someuser"                          # Optional: name of the user, who is running the tests, defaults to whoami/uid
 #  cluster:                                    # Workload cluster where tests should run, will get overriden if run on Multicluster
 #    project: "kuadrant"                       # Optional: Default namespace for this cluster
diff --git a/config/settings.yaml b/config/settings.yaml
index c87f67e8..bbec2837 100644
--- a/config/settings.yaml
+++ b/config/settings.yaml
@@ -1,5 +1,4 @@
 default:
-  skip_cleanup: false
   dynaconf_merge: true
   cluster: {}
   tools:
diff --git a/testsuite/tests/conftest.py b/testsuite/tests/conftest.py
index f3fc052f..44f78c42 100644
--- a/testsuite/tests/conftest.py
+++ b/testsuite/tests/conftest.py
@@ -169,9 +169,6 @@ def rhsso(request, testconfig, blame, skip_or_fail):
             cnf["test_user"]["password"],
         )
 
-        if not testconfig["skip_cleanup"]:
-            request.addfinalizer(info.delete)
-
         info.commit()
         return info
     except KeycloakAuthenticationError:
diff --git a/testsuite/tests/kuadrant/authorino/dinosaur/conftest.py b/testsuite/tests/kuadrant/authorino/dinosaur/conftest.py
index a45957e2..583a34b9 100644
--- a/testsuite/tests/kuadrant/authorino/dinosaur/conftest.py
+++ b/testsuite/tests/kuadrant/authorino/dinosaur/conftest.py
@@ -11,7 +11,7 @@
 
 
 @pytest.fixture(scope="session")
-def admin_rhsso(request, testconfig, blame, rhsso):
+def admin_rhsso(blame, rhsso):
     """RHSSO OIDC Provider fixture"""
 
     info = RHSSO(
@@ -24,8 +24,6 @@ def admin_rhsso(request, testconfig, blame, rhsso):
         rhsso.test_password,
     )
 
-    if not testconfig["skip_cleanup"]:
-        request.addfinalizer(info.delete)
     info.commit()
     return info