sts-sponsors team mailing list archive

[Alberto Donato <mp+441583@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:split-pytest-tests into maas:master.

Commit message:
move pytest tests to a tree parallel to code

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/441583
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/Makefile b/Makefile
index bd0cb27..6cf4682 100644
--- a/Makefile
+++ b/Makefile
@@ -152,13 +152,13 @@ test-go:
 test-perf: bin/pytest
 	GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
 	GIT_HASH=$(shell git rev-parse HEAD) \
-	bin/pytest src/maasperf/
+	bin/pytest src/tests/maasperf/
 .PHONY: test-perf
 
 test-perf-quiet: bin/pytest
 	GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
 	GIT_HASH=$(shell git rev-parse HEAD) \
-	bin/pytest -q --disable-warnings --show-capture=no --no-header --no-summary src/maasperf/
+	bin/pytest -q --disable-warnings --show-capture=no --no-header --no-summary src/tests/maasperf/
 .PHONY: test-perf-quiet
 
 update-initial-sql: bin/database bin/maas-region cleandb
diff --git a/pyproject.toml b/pyproject.toml
index d6de9a2..06f66e6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,21 +44,5 @@ exclude = [
 [tool.pytest.ini_options]
 filterwarnings = "error::BytesWarning"
 testpaths = [
-  "src/apiclient",
-  "src/maascli",
-  "src/maastesting",
-  "src/maasperf",
-  # [[[cog
-  # import cog
-  # from pathlib import Path
-  # for path in sorted(Path("src").glob("**/pytest_tests")):
-  #    cog.outl(f'"{path}",')
-  # ]]]
-  "src/maasserver/djangosettings/pytest_tests",
-  "src/maasserver/management/commands/pytest_tests",
-  "src/maasserver/models/pytest_tests",
-  "src/maasserver/pytest_tests",
-  "src/metadataserver/builtin_scripts/pytest_tests",
-  "src/provisioningserver/utils/pytest_tests",
-  # [[[end]]]
+  "src/tests",
 ]
diff --git a/setup.cfg b/setup.cfg
index d74724e..84c0503 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,11 +30,12 @@ where = src
 exclude =
     *.testing
     *.tests
-    *.pytest_tests
-    maastesting
-    maastesting.*
-    maasperf
-    maasperf.*
+include =
+    apiclient*
+    maascli*
+    maasserver*
+    metadataserver*
+    provisioningserver*
 
 [options.entry_points]
 console_scripts =
diff --git a/src/maastesting/pytest.dirs b/src/maastesting/pytest.dirs
deleted file mode 100644
index 2c155af..0000000
--- a/src/maastesting/pytest.dirs
+++ /dev/null
@@ -1,13 +0,0 @@
-# [[[cog
-# import cog
-# from pathlib import Path
-# for path in sorted(Path("src").glob("**/pytest_tests")):
-#    cog.outl(str(path))
-# ]]]
-src/maasserver/djangosettings/pytest_tests
-src/maasserver/management/commands/pytest_tests
-src/maasserver/models/pytest_tests
-src/maasserver/pytest_tests
-src/metadataserver/builtin_scripts/pytest_tests
-src/provisioningserver/utils/pytest_tests
-# [[[end]]]
diff --git a/src/maastesting/scripts.py b/src/maastesting/scripts.py
index ef48b5a..dc4f7ff 100644
--- a/src/maastesting/scripts.py
+++ b/src/maastesting/scripts.py
@@ -50,8 +50,6 @@ def run_region():
         "--select-dir=src/metadataserver",
         "--cover-package=maas,maasserver,metadataserver",
         "--cover-branches",
-        # exclude pytest tests
-        "--exclude-dir-file=src/maastesting/pytest.dirs",
         # 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
@@ -94,8 +92,6 @@ def run_region_legacy():
         "--select-dir=src/metadataserver",
         "--cover-package=maas,maasserver,metadataserver",
         "--cover-branches",
-        # exclude pytest tests
-        "--exclude-dir-file=src/maastesting/pytest.dirs",
         # 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.
@@ -122,8 +118,6 @@ def run_rack():
         "--select-dir=src/provisioningserver",
         "--cover-package=provisioningserver",
         "--cover-branches",
-        # exclude pytest tests
-        "--exclude-dir-file=src/maastesting/pytest.dirs",
     ]
     inject_test_options(options)
     update_environ()
diff --git a/src/apiclient/tests/__init__.py b/src/tests/__init__.py
similarity index 100%
rename from src/apiclient/tests/__init__.py
rename to src/tests/__init__.py
diff --git a/src/maascli/actions/tests/__init__.py b/src/tests/apiclient/__init__.py
similarity index 100%
rename from src/maascli/actions/tests/__init__.py
rename to src/tests/apiclient/__init__.py
diff --git a/src/apiclient/tests/test_creds.py b/src/tests/apiclient/test_creds.py
similarity index 100%
rename from src/apiclient/tests/test_creds.py
rename to src/tests/apiclient/test_creds.py
diff --git a/src/apiclient/tests/test_encode_json.py b/src/tests/apiclient/test_encode_json.py
similarity index 100%
rename from src/apiclient/tests/test_encode_json.py
rename to src/tests/apiclient/test_encode_json.py
diff --git a/src/apiclient/tests/test_maas_client.py b/src/tests/apiclient/test_maas_client.py
similarity index 100%
rename from src/apiclient/tests/test_maas_client.py
rename to src/tests/apiclient/test_maas_client.py
diff --git a/src/apiclient/tests/test_multipart.py b/src/tests/apiclient/test_multipart.py
similarity index 100%
rename from src/apiclient/tests/test_multipart.py
rename to src/tests/apiclient/test_multipart.py
diff --git a/src/apiclient/tests/test_utils.py b/src/tests/apiclient/test_utils.py
similarity index 100%
rename from src/apiclient/tests/test_utils.py
rename to src/tests/apiclient/test_utils.py
diff --git a/src/conftest.py b/src/tests/conftest.py
similarity index 84%
rename from src/conftest.py
rename to src/tests/conftest.py
index 4743647..1fc9ea9 100644
--- a/src/conftest.py
+++ b/src/tests/conftest.py
@@ -5,7 +5,12 @@ from pathlib import Path
 
 import pytest
 
-from provisioningserver.utils.env import MAAS_ID, MAAS_UUID, MAAS_SHARED_SECRET, MAAS_SECRET
+from provisioningserver.utils.env import (
+    MAAS_ID,
+    MAAS_SECRET,
+    MAAS_SHARED_SECRET,
+    MAAS_UUID,
+)
 
 
 @pytest.fixture(autouse=True)
diff --git a/src/maascli/tests/__init__.py b/src/tests/maascli/__init__.py
similarity index 100%
rename from src/maascli/tests/__init__.py
rename to src/tests/maascli/__init__.py
diff --git a/src/maasperf/__init__.py b/src/tests/maascli/actions/__init__.py
similarity index 100%
rename from src/maasperf/__init__.py
rename to src/tests/maascli/actions/__init__.py
diff --git a/src/maascli/actions/tests/test_boot_resources_create.py b/src/tests/maascli/actions/test_boot_resources_create.py
similarity index 100%
rename from src/maascli/actions/tests/test_boot_resources_create.py
rename to src/tests/maascli/actions/test_boot_resources_create.py
diff --git a/src/maascli/actions/tests/test_sshkeys_import.py b/src/tests/maascli/actions/test_sshkeys_import.py
similarity index 100%
rename from src/maascli/actions/tests/test_sshkeys_import.py
rename to src/tests/maascli/actions/test_sshkeys_import.py
diff --git a/src/maascli/tests/test_api.py b/src/tests/maascli/test_api.py
similarity index 100%
rename from src/maascli/tests/test_api.py
rename to src/tests/maascli/test_api.py
diff --git a/src/maascli/tests/test_auth.py b/src/tests/maascli/test_auth.py
similarity index 100%
rename from src/maascli/tests/test_auth.py
rename to src/tests/maascli/test_auth.py
diff --git a/src/maascli/tests/test_cli.py b/src/tests/maascli/test_cli.py
similarity index 99%
rename from src/maascli/tests/test_cli.py
rename to src/tests/maascli/test_cli.py
index 5fd0718..52507fa 100644
--- a/src/maascli/tests/test_cli.py
+++ b/src/tests/maascli/test_cli.py
@@ -21,11 +21,12 @@ from maascli.auth import UnexpectedResponse
 from maascli.cli import CERTS_DIR
 from maascli.config import ProfileConfig
 from maascli.parser import ArgumentParser
-from maascli.tests.test_auth import make_credentials, make_options
 from maastesting.factory import factory
 from maastesting.testcase import MAASTestCase
 from provisioningserver.testing.certificates import get_sample_cert
 
+from .test_auth import make_credentials, make_options
+
 
 class TestRegisterCommands(MAASTestCase):
     """Tests for registers CLI commands."""
diff --git a/src/maascli/tests/test_config.py b/src/tests/maascli/test_config.py
similarity index 100%
rename from src/maascli/tests/test_config.py
rename to src/tests/maascli/test_config.py
diff --git a/src/maascli/tests/test_configfile.py b/src/tests/maascli/test_configfile.py
similarity index 100%
rename from src/maascli/tests/test_configfile.py
rename to src/tests/maascli/test_configfile.py
diff --git a/src/maascli/tests/test_init.py b/src/tests/maascli/test_init.py
similarity index 100%
rename from src/maascli/tests/test_init.py
rename to src/tests/maascli/test_init.py
diff --git a/src/maascli/tests/test_integration.py b/src/tests/maascli/test_integration.py
similarity index 100%
rename from src/maascli/tests/test_integration.py
rename to src/tests/maascli/test_integration.py
diff --git a/src/maascli/tests/test_parser.py b/src/tests/maascli/test_parser.py
similarity index 100%
rename from src/maascli/tests/test_parser.py
rename to src/tests/maascli/test_parser.py
diff --git a/src/maascli/tests/test_profile.py b/src/tests/maascli/test_profile.py
similarity index 100%
rename from src/maascli/tests/test_profile.py
rename to src/tests/maascli/test_profile.py
diff --git a/src/maascli/tests/test_snap.py b/src/tests/maascli/test_snap.py
similarity index 100%
rename from src/maascli/tests/test_snap.py
rename to src/tests/maascli/test_snap.py
diff --git a/src/maascli/tests/test_utils.py b/src/tests/maascli/test_utils.py
similarity index 100%
rename from src/maascli/tests/test_utils.py
rename to src/tests/maascli/test_utils.py
diff --git a/src/maasperf/tests/__init__.py b/src/tests/maasperf/__init__.py
similarity index 100%
rename from src/maasperf/tests/__init__.py
rename to src/tests/maasperf/__init__.py
diff --git a/src/maasperf/tests/cli/__init__.py b/src/tests/maasperf/cli/__init__.py
similarity index 100%
rename from src/maasperf/tests/cli/__init__.py
rename to src/tests/maasperf/cli/__init__.py
diff --git a/src/maasperf/tests/cli/conftest.py b/src/tests/maasperf/cli/conftest.py
similarity index 100%
rename from src/maasperf/tests/cli/conftest.py
rename to src/tests/maasperf/cli/conftest.py
diff --git a/src/maasperf/tests/cli/test_machines.py b/src/tests/maasperf/cli/test_machines.py
similarity index 100%
rename from src/maasperf/tests/cli/test_machines.py
rename to src/tests/maasperf/cli/test_machines.py
diff --git a/src/maasperf/tests/maasserver/__init__.py b/src/tests/maasperf/maasserver/__init__.py
similarity index 100%
rename from src/maasperf/tests/maasserver/__init__.py
rename to src/tests/maasperf/maasserver/__init__.py
diff --git a/src/maasperf/tests/maasserver/api/__init__.py b/src/tests/maasperf/maasserver/api/__init__.py
similarity index 100%
rename from src/maasperf/tests/maasserver/api/__init__.py
rename to src/tests/maasperf/maasserver/api/__init__.py
diff --git a/src/maasperf/tests/maasserver/api/test_machines.py b/src/tests/maasperf/maasserver/api/test_machines.py
similarity index 100%
rename from src/maasperf/tests/maasserver/api/test_machines.py
rename to src/tests/maasperf/maasserver/api/test_machines.py
diff --git a/src/maasperf/tests/maasserver/dns/__init__.py b/src/tests/maasperf/maasserver/dns/__init__.py
similarity index 100%
rename from src/maasperf/tests/maasserver/dns/__init__.py
rename to src/tests/maasperf/maasserver/dns/__init__.py
diff --git a/src/maasperf/tests/maasserver/dns/conftest.py b/src/tests/maasperf/maasserver/dns/conftest.py
similarity index 100%
rename from src/maasperf/tests/maasserver/dns/conftest.py
rename to src/tests/maasperf/maasserver/dns/conftest.py
diff --git a/src/maasperf/tests/maasserver/dns/test_config.py b/src/tests/maasperf/maasserver/dns/test_config.py
similarity index 100%
rename from src/maasperf/tests/maasserver/dns/test_config.py
rename to src/tests/maasperf/maasserver/dns/test_config.py
diff --git a/src/maasperf/tests/maasserver/models/__init__.py b/src/tests/maasperf/maasserver/models/__init__.py
similarity index 100%
rename from src/maasperf/tests/maasserver/models/__init__.py
rename to src/tests/maasperf/maasserver/models/__init__.py
diff --git a/src/maasperf/tests/maasserver/models/test_machine.py b/src/tests/maasperf/maasserver/models/test_machine.py
similarity index 100%
rename from src/maasperf/tests/maasserver/models/test_machine.py
rename to src/tests/maasperf/maasserver/models/test_machine.py
diff --git a/src/maasperf/tests/maasserver/websockets/__init__.py b/src/tests/maasperf/maasserver/websockets/__init__.py
similarity index 100%
rename from src/maasperf/tests/maasserver/websockets/__init__.py
rename to src/tests/maasperf/maasserver/websockets/__init__.py
diff --git a/src/maasperf/tests/maasserver/websockets/conftest.py b/src/tests/maasperf/maasserver/websockets/conftest.py
similarity index 100%
rename from src/maasperf/tests/maasserver/websockets/conftest.py
rename to src/tests/maasperf/maasserver/websockets/conftest.py
diff --git a/src/maasperf/tests/maasserver/websockets/test_machines.py b/src/tests/maasperf/maasserver/websockets/test_machines.py
similarity index 100%
rename from src/maasperf/tests/maasserver/websockets/test_machines.py
rename to src/tests/maasperf/maasserver/websockets/test_machines.py
diff --git a/src/maasserver/djangosettings/pytest_tests/__init__.py b/src/tests/maasserver/__init__.py
similarity index 100%
rename from src/maasserver/djangosettings/pytest_tests/__init__.py
rename to src/tests/maasserver/__init__.py
diff --git a/src/maasserver/conftest.py b/src/tests/maasserver/conftest.py
similarity index 100%
rename from src/maasserver/conftest.py
rename to src/tests/maasserver/conftest.py
diff --git a/src/maasserver/management/commands/pytest_tests/__init__.py b/src/tests/maasserver/djangosettings/__init__.py
similarity index 100%
rename from src/maasserver/management/commands/pytest_tests/__init__.py
rename to src/tests/maasserver/djangosettings/__init__.py
diff --git a/src/maasserver/djangosettings/pytest_tests/test_settings.py b/src/tests/maasserver/djangosettings/test_settings.py
similarity index 100%
rename from src/maasserver/djangosettings/pytest_tests/test_settings.py
rename to src/tests/maasserver/djangosettings/test_settings.py
diff --git a/src/maasserver/pytest_tests/__init__.py b/src/tests/maasserver/management/commands/__init__.py
similarity index 100%
rename from src/maasserver/pytest_tests/__init__.py
rename to src/tests/maasserver/management/commands/__init__.py
diff --git a/src/maasserver/management/commands/pytest_tests/test_config_vault.py b/src/tests/maasserver/management/commands/test_config_vault.py
similarity index 100%
rename from src/maasserver/management/commands/pytest_tests/test_config_vault.py
rename to src/tests/maasserver/management/commands/test_config_vault.py
diff --git a/src/maasserver/models/pytest_tests/test_node.py b/src/tests/maasserver/models/test_node.py
similarity index 100%
rename from src/maasserver/models/pytest_tests/test_node.py
rename to src/tests/maasserver/models/test_node.py
diff --git a/src/maasserver/pytest_tests/test_certificates.py b/src/tests/maasserver/test_certificates.py
similarity index 100%
rename from src/maasserver/pytest_tests/test_certificates.py
rename to src/tests/maasserver/test_certificates.py
diff --git a/src/maasserver/pytest_tests/test_fields.py b/src/tests/maasserver/test_fields.py
similarity index 100%
rename from src/maasserver/pytest_tests/test_fields.py
rename to src/tests/maasserver/test_fields.py
diff --git a/src/maasserver/pytest_tests/test_secrets.py b/src/tests/maasserver/test_secrets.py
similarity index 100%
rename from src/maasserver/pytest_tests/test_secrets.py
rename to src/tests/maasserver/test_secrets.py
diff --git a/src/maasserver/pytest_tests/test_sessiontimeout.py b/src/tests/maasserver/test_sessiontimeout.py
similarity index 100%
rename from src/maasserver/pytest_tests/test_sessiontimeout.py
rename to src/tests/maasserver/test_sessiontimeout.py
diff --git a/src/maasserver/pytest_tests/test_vault.py b/src/tests/maasserver/test_vault.py
similarity index 100%
rename from src/maasserver/pytest_tests/test_vault.py
rename to src/tests/maasserver/test_vault.py
diff --git a/src/maastesting/management/commands/tests/__init__.py b/src/tests/maastesting/__init__.py
similarity index 100%
rename from src/maastesting/management/commands/tests/__init__.py
rename to src/tests/maastesting/__init__.py
diff --git a/src/maastesting/pytest/tests/__init__.py b/src/tests/maastesting/management/commands/__init__.py
similarity index 100%
rename from src/maastesting/pytest/tests/__init__.py
rename to src/tests/maastesting/management/commands/__init__.py
diff --git a/src/maastesting/tests/__init__.py b/src/tests/maastesting/pytest/__init__.py
similarity index 100%
rename from src/maastesting/tests/__init__.py
rename to src/tests/maastesting/pytest/__init__.py
diff --git a/src/maastesting/pytest/tests/test_perftest.py b/src/tests/maastesting/pytest/test_perftest.py
similarity index 100%
rename from src/maastesting/pytest/tests/test_perftest.py
rename to src/tests/maastesting/pytest/test_perftest.py
diff --git a/src/maastesting/tests/test_factory.py b/src/tests/maastesting/test_factory.py
similarity index 100%
rename from src/maastesting/tests/test_factory.py
rename to src/tests/maastesting/test_factory.py
diff --git a/src/maastesting/tests/test_fakemethod.py b/src/tests/maastesting/test_fakemethod.py
similarity index 100%
rename from src/maastesting/tests/test_fakemethod.py
rename to src/tests/maastesting/test_fakemethod.py
diff --git a/src/maastesting/tests/test_fixtures.py b/src/tests/maastesting/test_fixtures.py
similarity index 100%
rename from src/maastesting/tests/test_fixtures.py
rename to src/tests/maastesting/test_fixtures.py
diff --git a/src/maastesting/tests/test_httpd.py b/src/tests/maastesting/test_httpd.py
similarity index 100%
rename from src/maastesting/tests/test_httpd.py
rename to src/tests/maastesting/test_httpd.py
diff --git a/src/maastesting/tests/test_matchers.py b/src/tests/maastesting/test_matchers.py
similarity index 100%
rename from src/maastesting/tests/test_matchers.py
rename to src/tests/maastesting/test_matchers.py
diff --git a/src/maastesting/tests/test_noseplug.py b/src/tests/maastesting/test_noseplug.py
similarity index 100%
rename from src/maastesting/tests/test_noseplug.py
rename to src/tests/maastesting/test_noseplug.py
diff --git a/src/maastesting/tests/test_package.py b/src/tests/maastesting/test_package.py
similarity index 100%
rename from src/maastesting/tests/test_package.py
rename to src/tests/maastesting/test_package.py
diff --git a/src/maastesting/tests/test_parallel.py b/src/tests/maastesting/test_parallel.py
similarity index 100%
rename from src/maastesting/tests/test_parallel.py
rename to src/tests/maastesting/test_parallel.py
diff --git a/src/maastesting/tests/test_runtest.py b/src/tests/maastesting/test_runtest.py
similarity index 100%
rename from src/maastesting/tests/test_runtest.py
rename to src/tests/maastesting/test_runtest.py
diff --git a/src/maastesting/tests/test_scenarios.py b/src/tests/maastesting/test_scenarios.py
similarity index 100%
rename from src/maastesting/tests/test_scenarios.py
rename to src/tests/maastesting/test_scenarios.py
diff --git a/src/maastesting/tests/test_testcase.py b/src/tests/maastesting/test_testcase.py
similarity index 100%
rename from src/maastesting/tests/test_testcase.py
rename to src/tests/maastesting/test_testcase.py
diff --git a/src/maastesting/tests/test_utils.py b/src/tests/maastesting/test_utils.py
similarity index 100%
rename from src/maastesting/tests/test_utils.py
rename to src/tests/maastesting/test_utils.py
diff --git a/src/metadataserver/builtin_scripts/pytest_tests/__init__.py b/src/tests/metadataserver/builtin_scripts/__init__.py
similarity index 100%
rename from src/metadataserver/builtin_scripts/pytest_tests/__init__.py
rename to src/tests/metadataserver/builtin_scripts/__init__.py
diff --git a/src/metadataserver/builtin_scripts/pytest_tests/test_hooks.py b/src/tests/metadataserver/builtin_scripts/test_hooks.py
similarity index 100%
rename from src/metadataserver/builtin_scripts/pytest_tests/test_hooks.py
rename to src/tests/metadataserver/builtin_scripts/test_hooks.py
diff --git a/src/provisioningserver/utils/pytest_tests/__init__.py b/src/tests/provisioningserver/utils/__init__.py
similarity index 100%
rename from src/provisioningserver/utils/pytest_tests/__init__.py
rename to src/tests/provisioningserver/utils/__init__.py
diff --git a/src/provisioningserver/utils/pytest_tests/test_arch.py b/src/tests/provisioningserver/utils/test_arch.py
similarity index 100%
rename from src/provisioningserver/utils/pytest_tests/test_arch.py
rename to src/tests/provisioningserver/utils/test_arch.py
diff --git a/src/provisioningserver/utils/pytest_tests/test_env.py b/src/tests/provisioningserver/utils/test_env.py
similarity index 100%
rename from src/provisioningserver/utils/pytest_tests/test_env.py
rename to src/tests/provisioningserver/utils/test_env.py
diff --git a/tox.ini b/tox.ini
index b89e81d..59e2209 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,6 @@ commands =
     setup-cfg-fmt setup.cfg
     isort {[files]lint}
     black -q {[files]lint}
-    cog -r --verbosity=1 {[files]cog}
     - pyproject-fmt pyproject.toml
     - tox-ini-fmt tox.ini
 
@@ -25,7 +24,6 @@ commands =
     isort --check-only --diff {[files]lint}
     black --check {[files]lint}
     flake8 {[files]lint}
-    cog --check --verbosity=1 {[files]cog}
     pyproject-fmt --check pyproject.toml
 
 [testenv:oapi]
@@ -39,29 +37,22 @@ lint =
     package-files/usr/lib/maas/maas-delete-file \
     package-files/usr/sbin/maas-dhcp-helper \
     setup.py \
-    src/apiclient \
-    src/maascli \
-    src/maasperf \
     src/maasserver \
-    src/maastesting \
     src/metadataserver \
     src/provisioningserver \
     src/provisioningserver/refresh/50-maas-01-commissioning \
+    src/tests/ \
     utilities/bin2python.py \
     utilities/check-imports \
     utilities/check-oapi \
     utilities/import-db-dump \
     utilities/python_standard_libs.py \
     utilities/snap-bind-mounts
-cog =
-    src/maastesting/pytest.dirs \
-    pyproject.toml
 
 [deps]
 lint =
     black == 23.1.0
     click == 8.1.3
-    cogapp == 3.3.0
     flake8 == 6.0.0
     flake8-pyproject == 1.2.3
     isort == 5.12.0
diff --git a/utilities/check-imports b/utilities/check-imports
index 70f75a5..50c05bb 100755
--- a/utilities/check-imports
+++ b/utilities/check-imports
@@ -186,15 +186,13 @@ MAASCLI = files("src/maascli/**/*.py")
 PerfTestHarness = files("src/maastesting/perftest.py")
 PerfTestMigrations = files("src/maastesting/migrations/**/*.py")
 PerfTestModel = files("src/maastesting/models.py")
-PerfTestTests = files("src/maastesting/tests/test_perftest.py")
-PerfTestPerf = files("src/**/perf/test_*.py")
+PerfTestTests = files("src/tests/maastesting/**/*.py")
 PerfTestConftest = files("src/**/perf/conftest.py")
 PerfTests = (
     PerfTestHarness
     & PerfTestMigrations
     & PerfTestModel
     & PerfTestTests
-    & PerfTestPerf
     & PerfTestConftest
 )
 PerfTestHarnessRule = Rule(
@@ -326,7 +324,6 @@ Tests = files(
     "src/**/test_*.py",
     "src/**/testing/**/*.py",
     "src/**/testing.py",
-    "src/**/conftest.py",
 )
 
 
diff --git a/utilities/run-perf-tests-ci b/utilities/run-perf-tests-ci
index f8f84c1..5cb3e91 100755
--- a/utilities/run-perf-tests-ci
+++ b/utilities/run-perf-tests-ci
@@ -34,5 +34,5 @@ bin/pytest \
     --maas-recreate-initial-db \
     --maas-initial-db "${DB_DUMP}" \
     --perf-output-dir "$OUTPUT_DIR" \
-    ./src/maasperf/
+    ./src/tests/maasperf/
 cp "$OUTPUT_DIR/results.json" "$OUTPUT_FILE"