Skip to content

Commit 2660188

Browse files
committed
fix: remove kind_only, obsolete now
1 parent 133d6e3 commit 2660188

1 file changed

Lines changed: 5 additions & 19 deletions

File tree

tests/integration/conftest.py

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ def pytest_addoption(parser):
5252

5353
def pytest_configure(config):
5454
config.addinivalue_line("markers", "slow: mark test as slow to run")
55-
config.addinivalue_line(
56-
"markers", "kind_only: tests that require a Kubernetes/Kind environment"
57-
)
5855
config.addinivalue_line(
5956
"markers",
6057
"dedicated_core_cluster: Marker for tests that need a dedicated core cluster installation",
@@ -202,7 +199,6 @@ def pytest_generate_tests(metafunc):
202199
run_kind = metafunc.config.getoption("--run-kind")
203200
run_compose = metafunc.config.getoption("--run-compose")
204201
run_https = metafunc.config.getoption("--run-https")
205-
is_kind_only = metafunc.definition.get_closest_marker("kind_only") is not None
206202

207203
if run_kind and run_https:
208204
raise ValueError(
@@ -211,23 +207,13 @@ def pytest_generate_tests(metafunc):
211207

212208
backends = []
213209

214-
# Logic for tests marked with @pytest.mark.kind_only
215-
if is_kind_only:
216-
if run_kind:
217-
backends = ["kind"]
218-
else:
219-
# If kind_only but --run-kind wasn't requested, we skip it
220-
backends = []
221-
222-
# Logic for standard tests
223-
else:
224-
if run_compose:
225-
backends.append("docker-compose")
226-
if run_kind:
227-
backends.append("kind")
210+
if run_compose:
211+
backends.append("docker-compose")
212+
if run_kind:
213+
backends.append("kind")
228214

229215
# Apply the parametrization
230-
if backends or is_kind_only:
216+
if backends:
231217
metafunc.parametrize("app_setup", backends, indirect=True)
232218

233219

0 commit comments

Comments
 (0)