Merge ~cgrabowski/maas:backport-perftests-split-to-3.2 into maas:3.2

[Christian Grabowski]

move performance tests so they're easier to select/skip for runners

    Drop the marker for performance tests and move them under src/maasperf.
    bin/pytest doesn't look there by default, while the bin/test.perf runner only runs tests under that tree.

    (cherry picked from commit fa5728e6ad5e902f01bfc2d0cd85e021c6b85bd7)

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport-perftests-split-to-3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12896/console
COMMIT: cb1204713c28325bb53a4f1be1012c22fb8394ed

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport-perftests-split-to-3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ee5c222dae442633edd5eaed0ce40fc2619bc375

review: Approve

diff --git a/Makefile b/Makefile
index 8aba789..ea62f89 100644
--- a/Makefile
+++ b/Makefile
@@ -139,13 +139,13 @@ test-py: bin/test.parallel bin/subunit-1to2 bin/subunit2junitxml bin/subunit2pyu
 test-perf: bin/test.perf
 	GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
 	GIT_HASH=$(shell git rev-parse HEAD) \
-	find . -type d -name perf | xargs bin/test.perf
+	bin/test.perf
 .PHONY: test-perf
 
 test-perf-quiet: bin/test.perf
 	GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
 	GIT_HASH=$(shell git rev-parse HEAD) \
-	find . -type d -name perf | xargs bin/test.perf -q --disable-warnings --show-capture=no --no-header --no-summary
+	bin/test.perf -q --disable-warnings --show-capture=no --no-header --no-summary
 .PHONY: test-perf-quiet
 
 update-initial-sql: bin/database bin/maas-region cleandb
diff --git a/conftest.py b/conftest.py
deleted file mode 100644
index 9029b08..0000000
--- a/conftest.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import pytest
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--perf",
-        action="store_true",
-        default=False,
-        help="run performance tests",
-    )
-
-
-def pytest_collection_modifyitems(config, items):
-    if config.getoption("--perf"):
-        # We want to run the performance tests
-        return
-    skip_perf = pytest.mark.skip(reason="need --perf option to run")
-    for item in items:
-        if "perftest" in item.keywords:
-            item.add_marker(skip_perf)
diff --git a/src/maascli/perf/__init__.py b/src/maasperf/__init__.py
similarity index 100%
rename from src/maascli/perf/__init__.py
rename to src/maasperf/__init__.py
diff --git a/src/maasserver/api/perf/__init__.py b/src/maasperf/tests/__init__.py
similarity index 100%
rename from src/maasserver/api/perf/__init__.py
rename to src/maasperf/tests/__init__.py
diff --git a/src/maasserver/models/perf/__init__.py b/src/maasperf/tests/cli/__init__.py
similarity index 100%
rename from src/maasserver/models/perf/__init__.py
rename to src/maasperf/tests/cli/__init__.py
diff --git a/src/maascli/perf/conftest.py b/src/maasperf/tests/cli/conftest.py
similarity index 100%
rename from src/maascli/perf/conftest.py
rename to src/maasperf/tests/cli/conftest.py
diff --git a/src/maascli/perf/test_machines.py b/src/maasperf/tests/cli/test_machines.py
similarity index 100%
rename from src/maascli/perf/test_machines.py
rename to src/maasperf/tests/cli/test_machines.py
diff --git a/src/maasperf/tests/conftest.py b/src/maasperf/tests/conftest.py
new file mode 100644
index 0000000..f44495e
--- /dev/null
+++ b/src/maasperf/tests/conftest.py
@@ -0,0 +1,41 @@
+# Copyright 2022 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from pytest import fixture
+
+from maasserver.models.user import get_auth_tokens
+from maasserver.testing.factory import factory as maasserver_factory
+from maasserver.testing.testclient import MAASSensibleOAuthClient
+
+
+# override pytest-django's db setup
+@fixture(scope="session")
+def django_db_setup():
+    pass
+
+
+@fixture(scope="session")
+def factory():
+    return maasserver_factory
+
+
+@fixture()
+def admin(factory):
+    return factory.make_admin()
+
+
+@fixture()
+def maas_user(factory):
+    return factory.make_User()
+
+
+@fixture()
+def api_client(maas_user):
+    return MAASSensibleOAuthClient(
+        user=maas_user, token=get_auth_tokens(maas_user)[0]
+    )
+
+
+@fixture()
+def admin_api_client(admin):
+    return MAASSensibleOAuthClient(user=admin, token=get_auth_tokens(admin)[0])
diff --git a/src/maasserver/websockets/handlers/perf/__init__.py b/src/maasperf/tests/maasserver/api/__init__.py
similarity index 100%
rename from src/maasserver/websockets/handlers/perf/__init__.py
rename to src/maasperf/tests/maasserver/api/__init__.py
diff --git a/src/maasserver/api/perf/test_machines.py b/src/maasperf/tests/maasserver/api/test_machines.py
similarity index 100%
rename from src/maasserver/api/perf/test_machines.py
rename to src/maasperf/tests/maasserver/api/test_machines.py
diff --git a/src/maasperf/tests/maasserver/models/__init__.py b/src/maasperf/tests/maasserver/models/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/maasperf/tests/maasserver/models/__init__.py
diff --git a/src/maasserver/models/perf/conftest.py b/src/maasperf/tests/maasserver/models/conftest.py
similarity index 100%
rename from src/maasserver/models/perf/conftest.py
rename to src/maasperf/tests/maasserver/models/conftest.py
diff --git a/src/maasserver/models/perf/test_machine.py b/src/maasperf/tests/maasserver/models/test_machine.py
similarity index 100%
rename from src/maasserver/models/perf/test_machine.py
rename to src/maasperf/tests/maasserver/models/test_machine.py
diff --git a/src/maasperf/tests/maasserver/websockets/__init__.py b/src/maasperf/tests/maasserver/websockets/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/maasperf/tests/maasserver/websockets/__init__.py
diff --git a/src/maasserver/websockets/handlers/perf/conftest.py b/src/maasperf/tests/maasserver/websockets/conftest.py
similarity index 100%
rename from src/maasserver/websockets/handlers/perf/conftest.py
rename to src/maasperf/tests/maasserver/websockets/conftest.py
diff --git a/src/maasserver/websockets/handlers/perf/test_machines.py b/src/maasperf/tests/maasserver/websockets/test_machines.py
similarity index 100%
rename from src/maasserver/websockets/handlers/perf/test_machines.py
rename to src/maasperf/tests/maasserver/websockets/test_machines.py
diff --git a/src/maasserver/conftest.py b/src/maasserver/conftest.py
index f44495e..688ad7c 100644
--- a/src/maasserver/conftest.py
+++ b/src/maasserver/conftest.py
@@ -3,39 +3,9 @@
 
 from pytest import fixture
 
-from maasserver.models.user import get_auth_tokens
 from maasserver.testing.factory import factory as maasserver_factory
-from maasserver.testing.testclient import MAASSensibleOAuthClient
-
-
-# override pytest-django's db setup
-@fixture(scope="session")
-def django_db_setup():
-    pass
 
 
 @fixture(scope="session")
 def factory():
     return maasserver_factory
-
-
-@fixture()
-def admin(factory):
-    return factory.make_admin()
-
-
-@fixture()
-def maas_user(factory):
-    return factory.make_User()
-
-
-@fixture()
-def api_client(maas_user):
-    return MAASSensibleOAuthClient(
-        user=maas_user, token=get_auth_tokens(maas_user)[0]
-    )
-
-
-@fixture()
-def admin_api_client(admin):
-    return MAASSensibleOAuthClient(user=admin, token=get_auth_tokens(admin)[0])
diff --git a/src/maastesting/perftest.py b/src/maastesting/perftest.py
index 46ddb8a..46ca79d 100644
--- a/src/maastesting/perftest.py
+++ b/src/maastesting/perftest.py
@@ -64,7 +64,6 @@ class PerfTester:
 def perf_test(commit_transaction=False, db_only=False):
     def inner(fn):
         @wraps(fn)
-        @mark.perftest
         @mark.django_db
         def wrapper(*args, **kwargs):
             from django.db import transaction
@@ -112,7 +111,7 @@ def run_perf_tests(env):
         perf_tester = PerfTester(env.get("GIT_BRANCH"), env.get("GIT_HASH"))
 
         pytest_main(
-            args=["--perf", "-m", "perftest", "--reuse-db"] + cmd_args,
+            args=["--reuse-db", "src/maasperf"] + cmd_args,
         )
     finally:
         perf_test_finish(env.get("OUTPUT_FILE"))
diff --git a/src/maastesting/scripts.py b/src/maastesting/scripts.py
index afdee65..18acde6 100644
--- a/src/maastesting/scripts.py
+++ b/src/maastesting/scripts.py
@@ -53,8 +53,6 @@ def run_region():
         "--cover-branches",
         # exclude pytest tests
         "--exclude-dir-file=src/maastesting/pytest.dirs",
-        # exclude perf tests
-        "--exclude=perf",
         # Reduce the logging level to INFO here as
         # DebuggingLoggerMiddleware logs the content of all the
         # requests at DEBUG level: we don't want this in the
@@ -99,8 +97,6 @@ def run_region_legacy():
         "--cover-branches",
         # exclude pytest tests
         "--exclude-dir-file=src/maastesting/pytest.dirs",
-        # exclude perf tests
-        "--exclude=perf",
         # Reduce the logging level to INFO here as DebuggingLoggerMiddleware
         # logs the content of all the requests at DEBUG level: we don't want
         # this in the tests as it's too verbose.
@@ -129,8 +125,6 @@ def run_rack():
         "--cover-branches",
         # exclude pytest tests
         "--exclude-dir-file=src/maastesting/pytest.dirs",
-        # exclude perf tests
-        "--exclude=perf",
     ]
     inject_test_options(options)
     update_environ()
diff --git a/src/maastesting/tests/conftest.py b/src/maastesting/tests/conftest.py
deleted file mode 100644
index 83dd6e4..0000000
--- a/src/maastesting/tests/conftest.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2022 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from pytest import fixture
-
-
-@fixture(scope="session")
-def django_db_setup():
-    pass