Skip to content

Commit

Permalink
Merge pull request #388 from pehala/remove_skip_cleanup
Browse files Browse the repository at this point in the history
Remove skip_cleanup as it was never fully working
  • Loading branch information
pehala authored May 17, 2024
2 parents 74fb9a4 + f635d43 commit d708199
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion config/settings.local.yaml.tpl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion config/settings.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
default:
skip_cleanup: false
dynaconf_merge: true
cluster: {}
tools:
Expand Down
3 changes: 0 additions & 3 deletions testsuite/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,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:
Expand Down
4 changes: 1 addition & 3 deletions testsuite/tests/kuadrant/authorino/dinosaur/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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

Expand Down

0 comments on commit d708199

Please sign in to comment.