Rename test modules to not collide

Makefile

@@ -21,17 +21,13 @@ pylint:
 	uv run -m pylint --errors-only .
 
 unit:
-	uv run -m pytest --verbose --color=yes artcommon/tests/
-	uv run -m pytest --verbose --color=yes doozer/tests/
-	uv run -m pytest --verbose --color=yes elliott/tests/
-	uv run -m pytest --verbose --color=yes pyartcd/tests/
-	uv run -m pytest --verbose --color=yes ocp-build-data-validator/tests/
+	uv run -m pytest --verbose --color=yes .
 
 functional-elliott:
-	uv run -m pytest --verbose --color=yes elliott/functional_tests/
+	uv run -m pytest --verbose --color=yes elliott/tests_functional_elliott/
 
 functional-doozer:
-	uv run -m pytest --verbose --color=yes doozer/tests_functional
+	uv run -m pytest --verbose --color=yes doozer/tests_functional_doozer/
 
 test: lint unit
 

doozer/setup.py

@@ -22,15 +22,15 @@
     long_description=open('README.md').read(),
     url="https://github.com/openshift-eng/art-tools/tree/main/doozer",
     license="Apache License, Version 2.0",
-    packages=find_packages(exclude=["tests", "tests.*", "tests_functional", "tests_functional.*"]),
+    packages=find_packages(exclude=["tests.*"]),
     include_package_data=True,
     entry_points={
         'console_scripts': [
             'doozer = doozerlib.cli.__main__:main',
         ],
     },
     install_requires=INSTALL_REQUIRES,
-    test_suite='tests',
+    test_suite='tests_doozer',
     dependency_links=[],
     python_requires='>=3.8',
     classifiers=[

doozer/tests_functional/test_basic_rebase.py → doozer/tests_functional_doozer/test_basic_rebase.py

@@ -4,7 +4,7 @@
 
 from dockerfile_parse import DockerfileParser
 
-from tests_functional import DoozerRunnerTestCase
+from tests_functional_doozer import DoozerRunnerTestCase
 
 
 class TestBasicRebase(DoozerRunnerTestCase):

doozer/tests_functional/test_golang_rebase.py → doozer/tests_functional_doozer/test_golang_rebase.py

@@ -4,7 +4,7 @@
 
 from dockerfile_parse import DockerfileParser
 
-from tests_functional import DoozerRunnerTestCase
+from tests_functional_doozer import DoozerRunnerTestCase
 
 
 class TestGoLangRebase(DoozerRunnerTestCase):

doozer/tests_functional/test_koji_wrapper.py → doozer/tests_functional_doozer/test_koji_wrapper.py

@@ -4,7 +4,7 @@
 
 from doozerlib import brew
 
-from tests_functional import DoozerRunnerTestCase
+from tests_functional_doozer import DoozerRunnerTestCase
 
 
 class TestKojiWrapper(DoozerRunnerTestCase):

doozer/tests_functional/test_metadata.py → doozer/tests_functional_doozer/test_metadata.py

@@ -5,7 +5,7 @@
 from doozerlib import metadata
 from mock import MagicMock
 
-from tests_functional import DoozerRunnerTestCase
+from tests_functional_doozer import DoozerRunnerTestCase
 
 
 class TestMetadata(DoozerRunnerTestCase):

doozer/tests_functional/test_sanity.py → doozer/tests_functional_doozer/test_sanity.py

@@ -4,7 +4,7 @@
 
 from artcommonlib import exectools
 
-from tests_functional import DoozerRunnerTestCase
+from tests_functional_doozer import DoozerRunnerTestCase
 
 
 class TestSanity(DoozerRunnerTestCase):

doozer/tests_functional/test_scan_sources.py → doozer/tests_functional_doozer/test_scan_sources.py

@@ -4,7 +4,7 @@
 
 import yaml
 
-from tests_functional import DoozerRunnerTestCase
+from tests_functional_doozer import DoozerRunnerTestCase
 
 
 class TestScanSources(DoozerRunnerTestCase):

elliott/tests/test_brew.py → elliott/tests_elliott/test_brew.py

@@ -9,7 +9,7 @@
 from flexmock import flexmock
 from tenacity import wait_none
 
-from tests import test_structures
+from tests_elliott import test_structures
 
 
 class TestBrew(unittest.TestCase):

elliott/tests/test_errata.py → elliott/tests_elliott/test_errata.py

@@ -12,7 +12,7 @@
 from elliottlib import brew, constants, errata, exceptions
 from flexmock import flexmock
 
-from tests import test_structures
+from tests_elliott import test_structures
 
 unshipped_builds = [
     Mock(

elliott/functional_tests/test_advisory_images.py → elliott/tests_functional_elliott/test_advisory_images.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 # this test may break for EOL releases - apparently the CDN repos for
 # some images may become undefined after the fact.

elliott/functional_tests/test_attach_cve_flaws.py → elliott/tests_functional_elliott/test_attach_cve_flaws.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class FindBugsSweepTestCase(unittest.TestCase):

elliott/functional_tests/test_change_state.py → elliott/tests_functional_elliott/test_change_state.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class ChangeStateTestCase(unittest.TestCase):

elliott/functional_tests/test_create.py → elliott/tests_functional_elliott/test_create.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class GreateTestCase(unittest.TestCase):

elliott/functional_tests/test_find_bugs_blocker.py → elliott/tests_functional_elliott/test_find_bugs_blocker.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class FindBugsBlockerTestCase(unittest.TestCase):

elliott/functional_tests/test_find_bugs_qe.py → elliott/tests_functional_elliott/test_find_bugs_qe.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class FindBugsQETestCase(unittest.TestCase):

elliott/functional_tests/test_find_bugs_sweep.py → elliott/tests_functional_elliott/test_find_bugs_sweep.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class FindBugsSweepTestCase(unittest.TestCase):

elliott/functional_tests/test_find_builds.py → elliott/tests_functional_elliott/test_find_builds.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 # This test may start failing once this version is EOL and we either change the
 # ocp-build-data bugzilla schema or all of the non-shipped builds are garbage-collected.

elliott/functional_tests/test_get.py → elliott/tests_functional_elliott/test_get.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class GetTestCase(unittest.TestCase):

elliott/functional_tests/test_konflux_release.py → elliott/tests_functional_elliott/test_konflux_release.py

@@ -3,7 +3,7 @@
 
 from doozerlib.backend.konflux_client import API_VERSION, KIND_SNAPSHOT
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class ReleaseTestCases(unittest.TestCase):

elliott/functional_tests/test_snapshot.py → elliott/tests_functional_elliott/test_snapshot.py

@@ -3,7 +3,7 @@
 
 from doozerlib.backend.konflux_client import API_VERSION, KIND_SNAPSHOT
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class SnapshotTestCases(unittest.TestCase):

elliott/functional_tests/test_verify_attached_bugs.py → elliott/tests_functional_elliott/test_verify_attached_bugs.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class VerifyBugs(unittest.TestCase):

elliott/functional_tests/test_verify_attached_operators.py → elliott/tests_functional_elliott/test_verify_attached_operators.py

@@ -5,7 +5,7 @@
 from elliottlib.cli import verify_attached_operators_cli
 from elliottlib.runtime import Runtime
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class TestVerifyAttachedOperators(unittest.TestCase):

elliott/functional_tests/test_verify_payload.py → elliott/tests_functional_elliott/test_verify_payload.py

@@ -1,7 +1,7 @@
 import subprocess
 import unittest
 
-from functional_tests import constants
+from tests_functional_elliott import constants
 
 
 class VerifyPayloadTestCase(unittest.TestCase):

pyartcd/setup.py

@@ -20,15 +20,15 @@
     description="Python based pipeline library for managing and automating Red Hat OpenShift Container Platform releases",
     url="https://github.com/openshift-eng/art-tools/tree/main/pyartcd",
     license="Apache License, Version 2.0",
-    packages=find_packages(exclude=["tests", "tests.*"]),
+    packages=find_packages(exclude=["tests.*"]),
     include_package_data=True,
     install_requires=INSTALL_REQUIRES,
     entry_points={
         'console_scripts': [
             'artcd = pyartcd.__main__:main',
         ],
     },
-    test_suite='tests',
+    test_suite='tests_pyartcd',
     dependency_links=[],
     python_requires='>=3.8',
     classifiers=[

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs = .git .venv doozer/tests_functional_doozer elliott/tests_functional_elliott