Adjuts imports, scripts and docs to point to the new test layout

hypothesis · Nov 9, 2023 · 0f1f4e6 · 0f1f4e6
1 parent deb761c
commit 0f1f4e6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/docs/developing/testing.rst b/docs/developing/testing.rst
@@ -52,11 +52,11 @@ To run the backend test suite only call ``tox`` directly. For example:
    tox -qe functests
 
    # Run only one test directory or test file:
-   tox tests/h/models/annotation_test.py
+   tox tests/unit/h/models/annotation_test.py
    tox -qe functests tests/functional/api/test_profile.py
 
    # To pass arguments to pytest put them after a `--`:
-   tox -- --exitfirst --pdb --failed-first tests/h
+   tox -- --exitfirst --pdb --failed-first tests/unit/h
    tox -qe functests -- --exitfirst --pdb --failed-first tests/functional
 
    # See all of pytest's command line options:

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
diff --git a/tests/unit/h/conftest.py b/tests/unit/h/conftest.py
@@ -172,7 +172,7 @@ def invalid_form(errors=None):
 @pytest.fixture
 def matchers():
     # pylint: disable=redefined-outer-name, import-outside-toplevel
-    from ..common import matchers
+    from tests.common import matchers
 
     return matchers
 

diff --git a/tests/unit/h/services/bulk_executor/_actions_test.py b/tests/unit/h/services/bulk_executor/_actions_test.py
@@ -20,7 +20,7 @@
     GroupUpsertAction,
     UserUpsertAction,
 )
-from tests.h.services.bulk_executor.conftest import (
+from tests.unit.h.services.bulk_executor.conftest import (
     AUTHORITY,
     group_membership_create,
     group_upsert_command,

diff --git a/tests/unit/h/services/bulk_executor/_executor_test.py b/tests/unit/h/services/bulk_executor/_executor_test.py
@@ -5,7 +5,7 @@
 from pytest import param
 
 from h.services.bulk_executor._executor import BulkExecutor
-from tests.h.services.bulk_executor.conftest import (
+from tests.unit.h.services.bulk_executor.conftest import (
     AUTHORITY,
     group_upsert_command,
     upsert_user_command,

diff --git a/tox.ini b/tox.ini
@@ -111,7 +111,7 @@ commands =
     checkformatting: black --check h tests bin
     checkformatting: isort --quiet --check-only h tests bin
     {tests,functests}: sh bin/create-testdb
-    tests: python -m pytest --cov --cov-report= --cov-fail-under=0 --numprocesses logical --dist loadgroup {posargs:tests/h/}
+    tests: python -m pytest --cov --cov-report= --cov-fail-under=0 --numprocesses logical --dist loadgroup {posargs:tests/unit/h/}
     functests: pytest {posargs:tests/functional/}
     docs: sphinx-autobuild -qT --open-browser -b dirhtml -d {envdir}/doctrees docs {envdir}/html
     checkdocs: sphinx-build -qTWn -b dirhtml -d {envdir}/doctrees docs {envdir}/html