Merge remote-tracking branch 'skeleton-docker/develop' into lineage/s…

…keleton
cisagov · Jul 28, 2023 · ceefbf9 · ceefbf9
2 parents 2eab6f4 + a9d6c92
commit ceefbf9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,4 +1,4 @@
 --requirement requirements.txt
 pre-commit
 pytest
-pytest-dockerc
+python-on-whales
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -4,15 +4,24 @@
 """
 # Third-Party Libraries
 import pytest
+from python_on_whales import docker
 
 MAIN_SERVICE_NAME = "update"
 
 
+@pytest.fixture(scope="session")
+def dockerc():
+    """Start up the Docker composition."""
+    docker.compose.up(detach=True)
+    yield docker
+    docker.compose.down()
+
+
 @pytest.fixture(scope="session")
 def main_container(dockerc):
     """Return the main container from the Docker composition."""
     # find the container by name even if it is stopped already
-    return dockerc.containers(service_names=[MAIN_SERVICE_NAME], stopped=True)[0]
+    return dockerc.compose.ps(services=[MAIN_SERVICE_NAME], all=True)[0]
 
 
 def pytest_addoption(parser):

diff --git a/tests/container_test.py b/tests/container_test.py
@@ -15,7 +15,7 @@ def test_container_count(dockerc):
     """Verify the test composition and container."""
     # stopped parameter allows non-running containers in results
     assert (
-        len(dockerc.containers(stopped=True)) == 1
+        len(dockerc.compose.ps(all=True)) == 2
     ), "Wrong number of containers were started."