tests/integration: Move test "ports" to corresponding directory

Signed-off-by: Monika Kairaityte <[email protected]>
containers · Jan 22, 2025 · eab8e87 · eab8e87
1 parent 149e4d9
commit eab8e87
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 67 deletions.
diff --git a/tests/integration/ports/__init__.py b/tests/integration/ports/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/integration/ports/test_podman_compose_ports.py b/tests/integration/ports/test_podman_compose_ports.py
@@ -0,0 +1,85 @@
+# SPDX-License-Identifier: GPL-2.0
+
+"""
+test_podman_compose_up_down.py
+
+Tests the podman compose up and down commands used to create and remove services.
+"""
+
+# pylint: disable=redefined-outer-name
+import os
+import unittest
+
+from tests.integration.test_podman_compose import podman_compose_path
+from tests.integration.test_podman_compose import test_path
+from tests.integration.test_utils import RunSubprocessMixin
+
+
+class TestPodmanCompose(unittest.TestCase, RunSubprocessMixin):
+    def test_up_with_ports(self):
+        up_cmd = [
+            "coverage",
+            "run",
+            podman_compose_path(),
+            "-f",
+            os.path.join(test_path(), "ports", "docker-compose.yml"),
+            "up",
+            "-d",
+            "--force-recreate",
+        ]
+
+        down_cmd = [
+            "coverage",
+            "run",
+            podman_compose_path(),
+            "-f",
+            os.path.join(test_path(), "ports", "docker-compose.yml"),
+            "down",
+            "--volumes",
+        ]
+
+        try:
+            self.run_subprocess_assert_returncode(up_cmd)
+
+        finally:
+            self.run_subprocess_assert_returncode(down_cmd)
+
+    def test_down_with_orphans(self):
+        container_id, _ = self.run_subprocess_assert_returncode([
+            "podman",
+            "run",
+            "--rm",
+            "-d",
+            "nopush/podman-compose-test",
+            "dumb-init",
+            "/bin/busybox",
+            "httpd",
+            "-f",
+            "-h",
+            "/etc/",
+            "-p",
+            "8000",
+        ])
+
+        down_cmd = [
+            "coverage",
+            "run",
+            podman_compose_path(),
+            "-f",
+            os.path.join(test_path(), "ports", "docker-compose.yml"),
+            "down",
+            "--volumes",
+            "--remove-orphans",
+        ]
+
+        self.run_subprocess_assert_returncode(down_cmd)
+
+        self.run_subprocess_assert_returncode(
+            [
+                "podman",
+                "container",
+                "exists",
+                container_id.decode("utf-8"),
+            ],
+            1,
+        )
diff --git a/tests/integration/test_podman_compose_tests.py b/tests/integration/test_podman_compose_tests.py
@@ -16,34 +16,6 @@
 
 
 class TestPodmanCompose(unittest.TestCase, RunSubprocessMixin):
-    def test_up_with_ports(self):
-        up_cmd = [
-            "coverage",
-            "run",
-            podman_compose_path(),
-            "-f",
-            os.path.join(test_path(), "ports", "docker-compose.yml"),
-            "up",
-            "-d",
-            "--force-recreate",
-        ]
-
-        down_cmd = [
-            "coverage",
-            "run",
-            podman_compose_path(),
-            "-f",
-            os.path.join(test_path(), "ports", "docker-compose.yml"),
-            "down",
-            "--volumes",
-        ]
-
-        try:
-            self.run_subprocess_assert_returncode(up_cmd)
-
-        finally:
-            self.run_subprocess_assert_returncode(down_cmd)
-
     def test_down_with_vols(self):
         up_cmd = [
             "coverage",
@@ -83,42 +55,3 @@ def test_down_with_vols(self):
             self.run_subprocess(["podman", "volume", "rm", "actual-name-of-volume"])
             self.assertEqual(return_code, 0)
 
-    def test_down_with_orphans(self):
-        container_id, _ = self.run_subprocess_assert_returncode([
-            "podman",
-            "run",
-            "--rm",
-            "-d",
-            "nopush/podman-compose-test",
-            "dumb-init",
-            "/bin/busybox",
-            "httpd",
-            "-f",
-            "-h",
-            "/etc/",
-            "-p",
-            "8000",
-        ])
-
-        down_cmd = [
-            "coverage",
-            "run",
-            podman_compose_path(),
-            "-f",
-            os.path.join(test_path(), "ports", "docker-compose.yml"),
-            "down",
-            "--volumes",
-            "--remove-orphans",
-        ]
-
-        self.run_subprocess_assert_returncode(down_cmd)
-
-        self.run_subprocess_assert_returncode(
-            [
-                "podman",
-                "container",
-                "exists",
-                container_id.decode("utf-8"),
-            ],
-            1,
-        )