bug-1884212: re-root antenna tests

docs/dev.rst

@@ -214,7 +214,7 @@ production, see documentation_.
 
       <pytest output>
 
-      app@...$ pytest tests/unittest/test_crashstorage.py
+      app@...$ pytest tests/test_crashstorage.py
 
    We're using pytest_ for a test harness and test discovery.
 
@@ -423,7 +423,7 @@ For example:
 
    <pytest output>
 
-   app@...$ pytest tests/unittest/test_crashstorage.py
+   app@...$ pytest tests/test_crashstorage.py
 
 We're using pytest_ for a test harness and test discovery.
 

pyproject.toml

@@ -20,7 +20,7 @@ docstring-quotes = "double"
 [tool.pytest.ini_options]
 addopts = "-rsxX --tb=native --showlocals -m 'not gcp'"
 norecursedirs = [".git", "docs", "bin"]
-testpaths = "tests/unittest/"
+testpaths = "tests/"
 
 markers = [
     "aws: tests that require aws backends to be configured in the environment. this is the default.",

tests/README.rst

@@ -1,29 +1,25 @@
-============
-Tests README
-============
+======
+README
+======
 
-In this directory are all the tests for Antenna. Each subdirectory holds a
-different test system. Consult the README in the subdirectory for details
-on setting up and running those tests.
+These test the Antenna code. We use the pytest test runner.
 
+Contents of this directory::
 
-Subdirectories
-==============
+    data/       -- holds test data
+    conftest.py -- holds pytest fixtures
+    test_*.py   -- a test file
 
-**tests/data/**
 
-    Data to make it easier to test a local instance.
+Run these tests from the repository root using::
 
-**tests/unittest/**
+    make test
 
-    These are written in Python, use pytest as the test runner and are run
-    during normal development to unit test the code in Antenna.
 
-    Run these with::
+To run a single test or group of tests or with different options, do::
 
-        $ make test
+    make testshell
 
-    Run with more options with::
 
-        $ make testshell
-        app@xxx:/app$ pytest
+This gives you a bash shell in the docker container where you can more easily
+do test runs and debugging.

tests/unittest/conftest.py → tests/conftest.py

@@ -24,7 +24,7 @@
 
 
 # Add repository root so we can import antenna and testlib.
-REPO_ROOT = Path(__file__).parent.parent.parent
+REPO_ROOT = Path(__file__).parent.parent.resolve()
 sys.path.insert(0, str(REPO_ROOT))
 
 from antenna.app import get_app, setup_logging  # noqa

tests/unittest/test_bin.py → tests/test_bin.py

@@ -7,7 +7,9 @@
 
 from click.testing import CliRunner
 
-sys.path.insert(0, str(Path(__file__).resolve().parent.parent.parent / "bin"))
+# Add bin/ directory so we can import scripts
+REPO_ROOT = Path(__file__).parent.parent.resolve()
+sys.path.insert(0, str(REPO_ROOT / "bin"))
 
 
 class TestPubSubCli: