diff --git a/tests/integration/merge/__init__.py b/tests/integration/merge/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/integration/merge/__init__.py @@ -0,0 +1 @@ + diff --git a/tests/integration/merge/reset_and_override_tags/__init__.py b/tests/integration/merge/reset_and_override_tags/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/integration/merge/reset_and_override_tags/__init__.py @@ -0,0 +1 @@ + diff --git a/tests/integration/merge/reset_and_override_tags/override_tag_attribute/test_podman_compose_override_tag_attribute.py b/tests/integration/merge/reset_and_override_tags/override_tag_attribute/test_podman_compose_override_tag_attribute.py index 3819f2c..2fe1339 100644 --- a/tests/integration/merge/reset_and_override_tags/override_tag_attribute/test_podman_compose_override_tag_attribute.py +++ b/tests/integration/merge/reset_and_override_tags/override_tag_attribute/test_podman_compose_override_tag_attribute.py @@ -10,15 +10,18 @@ from tests.integration.test_utils import test_path def compose_yaml_path(): - return os.path.join(os.path.join(test_path(), "override_tag_attribute"), "docker-compose.yaml") + return os.path.join( + test_path(), + "merge/reset_and_override_tags/override_tag_attribute/docker-compose.yaml", + ) class TestComposeOverrideTagAttribute(unittest.TestCase, RunSubprocessMixin): # test if a service attribute from docker-compose.yaml file is overridden def test_override_tag_attribute(self): override_file = os.path.join( - os.path.join(test_path(), "override_tag_attribute"), - "docker-compose.override_attribute.yaml", + test_path(), + "merge/reset_and_override_tags/override_tag_attribute/docker-compose.override_attribute.yaml", ) try: self.run_subprocess_assert_returncode([ diff --git a/tests/integration/merge/reset_and_override_tags/override_tag_service/test_podman_compose_override_tag_service.py b/tests/integration/merge/reset_and_override_tags/override_tag_service/test_podman_compose_override_tag_service.py index e39687c..115d59d 100644 --- a/tests/integration/merge/reset_and_override_tags/override_tag_service/test_podman_compose_override_tag_service.py +++ b/tests/integration/merge/reset_and_override_tags/override_tag_service/test_podman_compose_override_tag_service.py @@ -10,15 +10,18 @@ from tests.integration.test_utils import test_path def compose_yaml_path(): - return os.path.join(os.path.join(test_path(), "override_tag_service"), "docker-compose.yaml") + return os.path.join( + test_path(), + "merge/reset_and_override_tags/override_tag_service/docker-compose.yaml", + ) class TestComposeOverrideTagService(unittest.TestCase, RunSubprocessMixin): # test if whole service from docker-compose.yaml file is overridden in another file def test_override_tag_service(self): override_file = os.path.join( - os.path.join(test_path(), "override_tag_service"), - "docker-compose.override_service.yaml", + test_path(), + "merge/reset_and_override_tags/override_tag_service/docker-compose.override_service.yaml", ) try: self.run_subprocess_assert_returncode([ diff --git a/tests/integration/merge/reset_and_override_tags/reset_tag_attribute/test_podman_compose_reset_tag_attribute.py b/tests/integration/merge/reset_and_override_tags/reset_tag_attribute/test_podman_compose_reset_tag_attribute.py index 9c9634c..ec7e8f5 100644 --- a/tests/integration/merge/reset_and_override_tags/reset_tag_attribute/test_podman_compose_reset_tag_attribute.py +++ b/tests/integration/merge/reset_and_override_tags/reset_tag_attribute/test_podman_compose_reset_tag_attribute.py @@ -9,14 +9,18 @@ from tests.integration.test_utils import test_path def compose_yaml_path(): - return os.path.join(os.path.join(test_path(), "reset_tag_attribute"), "docker-compose.yaml") + return os.path.join( + test_path(), + "merge/reset_and_override_tags/reset_tag_attribute/docker-compose.yaml", + ) class TestComposeResetTagAttribute(unittest.TestCase, RunSubprocessMixin): # test if the attribute of the service is correctly reset def test_reset_tag_attribute(self): reset_file = os.path.join( - os.path.join(test_path(), "reset_tag_attribute"), "docker-compose.reset_attribute.yaml" + test_path(), + "merge/reset_and_override_tags/reset_tag_attribute/docker-compose.reset_attribute.yaml", ) try: self.run_subprocess_assert_returncode([ diff --git a/tests/integration/merge/reset_and_override_tags/reset_tag_service/test_podman_compose_reset_tag_service.py b/tests/integration/merge/reset_and_override_tags/reset_tag_service/test_podman_compose_reset_tag_service.py index d840291..d062621 100644 --- a/tests/integration/merge/reset_and_override_tags/reset_tag_service/test_podman_compose_reset_tag_service.py +++ b/tests/integration/merge/reset_and_override_tags/reset_tag_service/test_podman_compose_reset_tag_service.py @@ -9,14 +9,17 @@ from tests.integration.test_utils import test_path def compose_yaml_path(): - return os.path.join(os.path.join(test_path(), "reset_tag_service"), "docker-compose.yaml") + return os.path.join( + test_path(), "merge/reset_and_override_tags/reset_tag_service/docker-compose.yaml" + ) class TestComposeResetTagService(unittest.TestCase, RunSubprocessMixin): # test if whole service from docker-compose.yaml file is reset def test_reset_tag_service(self): reset_file = os.path.join( - os.path.join(test_path(), "reset_tag_service"), "docker-compose.reset_service.yaml" + test_path(), + "merge/reset_and_override_tags/reset_tag_service/docker-compose.reset_service.yaml", ) try: self.run_subprocess_assert_returncode([ diff --git a/tests/integration/merge/volumes_merge/test_podman_compose_volumes_merge.py b/tests/integration/merge/volumes_merge/test_podman_compose_volumes_merge.py index 6512d1e..4b3d361 100644 --- a/tests/integration/merge/volumes_merge/test_podman_compose_volumes_merge.py +++ b/tests/integration/merge/volumes_merge/test_podman_compose_volumes_merge.py @@ -11,7 +11,7 @@ from tests.integration.test_utils import test_path def compose_yaml_path(compose_name): """ "Returns the path to the compose file used for this test module""" - base_path = os.path.join(test_path(), "volumes_merge/") + base_path = os.path.join(test_path(), "merge/volumes_merge/") return os.path.join(base_path, compose_name) @@ -55,7 +55,7 @@ class TestComposeVolumesMerge(unittest.TestCase, RunSubprocessMixin): binds_info = volumes_info["HostConfig"]["Binds"] binds_info.sort() - file_path = os.path.join(test_path(), "volumes_merge/override.txt") + file_path = os.path.join(test_path(), "merge/volumes_merge/override.txt") expected = [ f'{file_path}:/var/www/html/index.html:ro,rprivate,rbind', f'{file_path}:/var/www/html/index2.html:rw,rprivate,rbind',