Skip to content

Commit

Permalink
Merge pull request #469 from jsmolar/jsmolar2
Browse files Browse the repository at this point in the history
Remove unnecessary performace test
  • Loading branch information
Jakub Smolar authored Jul 2, 2024
2 parents 66af332 + c0af039 commit b9e758d
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 337 deletions.
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: commit-acceptance pylint mypy black reformat test performance authorino poetry poetry-no-dev mgc container-image polish-junit reportportal authorino-standalone limitador kuadrant kuadrant-only disruptive
.PHONY: commit-acceptance pylint mypy black reformat test authorino poetry poetry-no-dev mgc container-image polish-junit reportportal authorino-standalone limitador kuadrant kuadrant-only disruptive

TB ?= short
LOGLEVEL ?= INFO
Expand Down Expand Up @@ -38,7 +38,7 @@ all-is-package:

# pattern to run individual testfile or all testfiles in directory
testsuite/%: FORCE poetry-no-dev
$(PYTEST) --performance -v $(flags) $@
$(PYTEST) -v $(flags) $@

test: ## Run all non mgc tests
test pytest tests: kuadrant
Expand Down Expand Up @@ -67,10 +67,6 @@ dnstls: ## Run DNS and TLS tests
dnstls: poetry-no-dev
$(PYTEST) -n4 -m 'dnspolicy or tlspolicy' --dist loadfile --enforce $(flags) testsuite

performance: ## Run performance tests
performance: poetry-no-dev
$(PYTEST) --performance $(flags) testsuite/tests/kuadrant/authorino/performance

disruptive: ## Run disruptive tests
disruptive: poetry-no-dev
$(PYTEST) -m 'disruptive' $(flags) testsuite
Expand Down
4 changes: 0 additions & 4 deletions config/settings.local.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
# collector_url: "rpc://jaeger-collector.com:4317" # Tracing collector URL (may be internal)
# query_url: "http://jaeger-query.com" # Tracing query URL
# cfssl: "cfssl" # Path to the CFSSL library for TLS tests
# hyperfoil:
# url: "HYPERFOIL_URL"
# generate_reports: True # True, if each test should generate a report
# report_dir: "reports" # Directory, to which the reports should be saved
# service_protection:
# system_project: "kuadrant-system" # Namespace where Kuadrant resource resides
# project: "kuadrant" # Namespace where tests will run
Expand Down
3 changes: 0 additions & 3 deletions config/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ default:
authorino:
deploy: true
log_level: "debug"
hyperfoil:
generate_reports: True
reports_dir: "reports"
control_plane:
managedzone: "aws-mz"
issuer:
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ line-length = 120
[tool.pytest.ini_options]
markers = [
"issue: Reference to covered issue",
"performance: Performance tests have unique needs",
"authorino: Test is using Authorino features",
"standalone_only: Test is using features available only in standalone mode, without Kuadrant",
"kuadrant_only: Test is using features available only in Kuadrant mode",
Expand Down
95 changes: 0 additions & 95 deletions testsuite/hyperfoil/__init__.py

This file was deleted.

5 changes: 0 additions & 5 deletions testsuite/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@

def pytest_addoption(parser):
"""Add options to include various kinds of tests in testrun"""
parser.addoption(
"--performance", action="store_true", default=False, help="Run also performance tests (default: False)"
)
parser.addoption(
"--enforce", action="store_true", default=False, help="Fails tests instead of skip, if capabilities are missing"
)
Expand All @@ -46,8 +43,6 @@ def pytest_runtest_setup(item):
In this function we skip or fail the tests that were selected but their capabilities are not available
"""
marks = [i.name for i in item.iter_markers()]
if "performance" in marks and not item.config.getoption("--performance"):
pytest.skip("Excluding performance tests")
skip_or_fail = pytest.fail if item.config.getoption("--enforce") else pytest.skip
standalone = item.config.getoption("--standalone")
if standalone:
Expand Down
Empty file.
84 changes: 0 additions & 84 deletions testsuite/tests/kuadrant/authorino/performance/conftest.py

This file was deleted.

Empty file.

This file was deleted.

80 changes: 0 additions & 80 deletions testsuite/tests/kuadrant/authorino/performance/test_perf_basic.py

This file was deleted.

0 comments on commit b9e758d

Please sign in to comment.