refactor(tests): organize by test category for easier filtering and parallel CI runs

.github/workflows/server.yml

@@ -43,10 +43,66 @@ jobs:
           run: |
             python -m pip install --upgrade pip
             pip install .
-  test:
+  test-unit:
+    runs-on: ubuntu-latest
+    needs: build-server
+    defaults:
+        run:
+            working-directory: server
+    steps:
+    - uses: actions/checkout@v6
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install '.[test]'
+        python -m pip install .
+    - name: Test unit tests
+      run: |
+        set -o pipefail
+        pytest tests/unit -v 2>&1 | tee pytest-unit.log
+    - name: Upload test log
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: pytest-unit-log
+        path: server/pytest-unit.log
+        retention-days: 14
+
+  test-integration:
+    runs-on: ubuntu-latest
+    needs: build-server
+    defaults:
+        run:
+            working-directory: server
+    steps:
+    - uses: actions/checkout@v6
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install '.[test]'
+        python -m pip install .
+    - name: Test integration tests
+      run: |
+        set -o pipefail
+        pytest tests/integration -v 2>&1 | tee pytest-integration.log
+    - name: Upload test log
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: pytest-integration-log
+        path: server/pytest-integration.log
+        retention-days: 14
+
+  test-container:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     needs: build-server
     defaults:
         run:
@@ -62,14 +118,14 @@ jobs:
         python -m pip install --upgrade pip
         python -m pip install '.[test]'
         python -m pip install .
-    - name: Test with pytest
+    - name: Test container tests
       run: |
         set -o pipefail
-        pytest -v 2>&1 | tee pytest-output.log
+        pytest tests/container -v 2>&1 | tee pytest-container.log
     - name: Upload test log
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: pytest-log
-        path: server/pytest-output.log
+        name: pytest-container-log
+        path: server/pytest-container.log
         retention-days: 14

.gitignore

@@ -6,6 +6,7 @@ venv
 
 ## caches
 .*_cache
+*.cache
 
 # ides
 .vscode

server/tests/test_container_smoke.py → server/tests/container/test_container_smoke.py

@@ -5,7 +5,7 @@
 
 from docker import DockerClient
 
-SERVER_DIR = Path(__file__).parent.parent
+SERVER_DIR = Path(__file__).parent.parent.parent
 
 
 @pytest.fixture(scope="session")

server/tests/docker.py → server/tests/integration/docker_compose.py

@@ -12,11 +12,11 @@
 
 
 def test_compose(compose_file: Path) -> DockerCompose:
-    current_path = Path(__file__).parent.resolve()
+    current_path = Path(__file__).parent.parent.parent.resolve()  # Navigate to server/ root
 
     return DockerCompose(
-        str(current_path.parent.resolve()),
-        compose_file_name=str(current_path.parent.joinpath(compose_file).resolve()),
+        str(current_path),
+        compose_file_name=str(current_path / compose_file),
         build=True,
     )
 

server/tests/docker/test-bash-ioc.yml → server/tests/integration/resources/docker-compose/test-bash-ioc.yml

@@ -1,10 +1,10 @@
 name: test-bash-ioc
 include:
-  - ../../docker/cf-compose.yml
+  - ../../../../docker/cf-compose.yml
 services:
   recc1:
     extends:
-      file: ../../compose.yml
+      file: ../../../../compose.yml
       service: recc
     depends_on:
       cf:
@@ -16,7 +16,7 @@ services:
       - net-2-cf
   ioc1-1:
     extends:
-      file: ../../../client/ioc-compose.yml
+      file: ../../../../../client/ioc-compose.yml
       service: ioc1
     environment:
       - IOCSH_NAME=IOC1-1

server/tests/docker/test-multi-recc.yml → server/tests/integration/resources/docker-compose/test-multi-recc.yml

@@ -1,10 +1,10 @@
 name: test-multi-recc
 include:
-  - ../../docker/cf-compose.yml
+  - ../../../../docker/cf-compose.yml
 services:
   recc1:
     extends:
-      file: ../../compose.yml
+      file: ../../../../compose.yml
       service: recc
     depends_on:
       cf:
@@ -16,7 +16,7 @@ services:
       - net-2-cf
   ioc1-1:
     extends:
-      file: ../../../client/ioc-compose.yml
+      file: ../../../../../client/ioc-compose.yml
       service: ioc1
     depends_on:
       recc1:

server/tests/docker/test-single-ioc.yml → server/tests/integration/resources/docker-compose/test-single-ioc.yml

@@ -1,10 +1,10 @@
 name: test-single-ioc
 include:
-  - ../../docker/cf-compose.yml
+  - ../../../../docker/cf-compose.yml
 services:
   recc1:
     extends:
-      file: ../../compose.yml
+      file: ../../../../compose.yml
       service: recc
     depends_on:
       cf:
@@ -16,7 +16,7 @@ services:
       - net-2-cf
   ioc1-1:
     extends:
-      file: ../../../client/ioc-compose.yml
+      file: ../../../../../client/ioc-compose.yml
       service: ioc1
     depends_on:
       recc1:

server/tests/test_bash_ioc.py → server/tests/integration/test_bash_ioc.py

@@ -9,15 +9,15 @@
 
 from docker import DockerClient
 
-from .client_checks import (
+from .cf_client import (
     BASE_IOC_CHANNEL_COUNT,
     DEFAULT_CHANNEL_NAME,
     INACTIVE_PROPERTY,
     check_channel_property,
     create_client_and_wait,
     wait_for_sync,
 )
-from .docker import ComposeFixtureFactory
+from .docker_compose import ComposeFixtureFactory
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
@@ -27,7 +27,9 @@
     encoding="utf-8",
 )
 
-setup_compose = ComposeFixtureFactory(Path("tests") / "docker" / "test-bash-ioc.yml").return_fixture()
+setup_compose = ComposeFixtureFactory(
+    Path("tests/integration/resources/docker-compose/test-bash-ioc.yml")
+).return_fixture()
 
 
 def docker_exec_new_command(container: Container, command: str, env: Optional[dict] = None) -> None:

server/tests/test_multiple_recceiver.py → server/tests/integration/test_multiple_recceiver.py

@@ -5,8 +5,8 @@
 from channelfinder import ChannelFinderClient
 from testcontainers.compose import DockerCompose
 
-from .client_checks import BASE_ALIAS_COUNT, BASE_IOC_CHANNEL_COUNT, DEFAULT_CHANNEL_NAME, create_client_and_wait
-from .docker import ComposeFixtureFactory
+from .cf_client import BASE_ALIAS_COUNT, BASE_IOC_CHANNEL_COUNT, DEFAULT_CHANNEL_NAME, create_client_and_wait
+from .docker_compose import ComposeFixtureFactory
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
@@ -15,7 +15,9 @@
 IOC_COUNT = 4
 EXPECTED_DEFAULT_CHANNEL_COUNT = IOC_COUNT * BASE_IOC_CHANNEL_COUNT
 
-setup_compose = ComposeFixtureFactory(Path("tests") / "docker" / "test-multi-recc.yml").return_fixture()
+setup_compose = ComposeFixtureFactory(
+    Path("tests/integration/resources/docker-compose/test-multi-recc.yml")
+).return_fixture()
 
 
 @pytest.fixture(scope="class")

server/tests/test_single_ioc.py → server/tests/integration/test_single_ioc.py

@@ -6,7 +6,7 @@
 from channelfinder import ChannelFinderClient
 from testcontainers.compose import DockerCompose
 
-from .client_checks import (
+from .cf_client import (
     BASE_IOC_CHANNEL_COUNT,
     DEFAULT_CHANNEL_NAME,
     INACTIVE_PROPERTY,
@@ -16,7 +16,7 @@
     create_client_from_compose,
     wait_for_sync,
 )
-from .docker import (
+from .docker_compose import (
     ComposeFixtureFactory,
     clone_container,
     restart_container,
@@ -28,7 +28,9 @@
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
-setup_compose = ComposeFixtureFactory(Path("tests") / "docker" / "test-single-ioc.yml").return_fixture()
+setup_compose = ComposeFixtureFactory(
+    Path("tests/integration/resources/docker-compose/test-single-ioc.yml")
+).return_fixture()
 
 
 @pytest.fixture(scope="class")