diff --git a/tests/integration/additional_contexts/test_podman_compose_additional_contexts.py b/tests/integration/additional_contexts/test_podman_compose_additional_contexts.py index 2a6df74..74600d6 100644 --- a/tests/integration/additional_contexts/test_podman_compose_additional_contexts.py +++ b/tests/integration/additional_contexts/test_podman_compose_additional_contexts.py @@ -7,8 +7,8 @@ import os import subprocess 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 podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/build/test_podman_compose_build.py b/tests/integration/build/test_podman_compose_build.py index ac4ce17..ce9da15 100644 --- a/tests/integration/build/test_podman_compose_build.py +++ b/tests/integration/build/test_podman_compose_build.py @@ -5,8 +5,8 @@ import unittest import requests -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 podman_compose_path +from tests.integration.test_utils import test_path from tests.integration.test_utils import RunSubprocessMixin diff --git a/tests/integration/build_fail/test_podman_compose_build_fail.py b/tests/integration/build_fail/test_podman_compose_build_fail.py index 1bb89a5..44dd920 100644 --- a/tests/integration/build_fail/test_podman_compose_build_fail.py +++ b/tests/integration/build_fail/test_podman_compose_build_fail.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/build_labels/test_build_labels.py b/tests/integration/build_labels/test_build_labels.py index aaa37a5..c0709ad 100644 --- a/tests/integration/build_labels/test_build_labels.py +++ b/tests/integration/build_labels/test_build_labels.py @@ -5,9 +5,9 @@ import json 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestBuildLabels(unittest.TestCase, RunSubprocessMixin): diff --git a/tests/integration/build_secrets/test_podman_compose_build_secrets.py b/tests/integration/build_secrets/test_podman_compose_build_secrets.py index e5360f6..d9a78b4 100644 --- a/tests/integration/build_secrets/test_podman_compose_build_secrets.py +++ b/tests/integration/build_secrets/test_podman_compose_build_secrets.py @@ -7,8 +7,8 @@ import os import subprocess 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 podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/build_ssh/test_build_ssh.py b/tests/integration/build_ssh/test_build_ssh.py index 57e3960..eb61098 100644 --- a/tests/integration/build_ssh/test_build_ssh.py +++ b/tests/integration/build_ssh/test_build_ssh.py @@ -9,9 +9,9 @@ import unittest from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path expected_lines = [ "default: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFYQvN9a+toIB6jSs4zY7FMapZnHt80EKCUr/WhLwUum", diff --git a/tests/integration/default_net_behavior/test_podman_compose_default_net_behavior.py b/tests/integration/default_net_behavior/test_podman_compose_default_net_behavior.py index 367562a..680f874 100644 --- a/tests/integration/default_net_behavior/test_podman_compose_default_net_behavior.py +++ b/tests/integration/default_net_behavior/test_podman_compose_default_net_behavior.py @@ -5,9 +5,9 @@ import unittest from parameterized import parameterized -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(scenario): diff --git a/tests/integration/deps/test_podman_compose_deps.py b/tests/integration/deps/test_podman_compose_deps.py index dfa8caf..e15f6ec 100644 --- a/tests/integration/deps/test_podman_compose_deps.py +++ b/tests/integration/deps/test_podman_compose_deps.py @@ -2,9 +2,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(suffix=""): diff --git a/tests/integration/env-file-tests/test_podman_compose_env_file.py b/tests/integration/env-file-tests/test_podman_compose_env_file.py index 5e0dbac..5676dc9 100644 --- a/tests/integration/env-file-tests/test_podman_compose_env_file.py +++ b/tests/integration/env-file-tests/test_podman_compose_env_file.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_base_path(): diff --git a/tests/integration/env-tests/test_podman_compose_env.py b/tests/integration/env-tests/test_podman_compose_env.py index 2eb6d30..351644f 100644 --- a/tests/integration/env-tests/test_podman_compose_env.py +++ b/tests/integration/env-tests/test_podman_compose_env.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/exit-from/test_podman_compose_exit_from.py b/tests/integration/exit-from/test_podman_compose_exit_from.py index c380543..1d36b9d 100644 --- a/tests/integration/exit-from/test_podman_compose_exit_from.py +++ b/tests/integration/exit-from/test_podman_compose_exit_from.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/extends/test_podman_compose_extends.py b/tests/integration/extends/test_podman_compose_extends.py index c6a730c..30e6a89 100644 --- a/tests/integration/extends/test_podman_compose_extends.py +++ b/tests/integration/extends/test_podman_compose_extends.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/extends_w_empty_service/test_podman_compose_extends_w_empty_service.py b/tests/integration/extends_w_empty_service/test_podman_compose_extends_w_empty_service.py index cf2df86..8be90b1 100644 --- a/tests/integration/extends_w_empty_service/test_podman_compose_extends_w_empty_service.py +++ b/tests/integration/extends_w_empty_service/test_podman_compose_extends_w_empty_service.py @@ -4,9 +4,9 @@ import os import unittest from pathlib import Path -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/extends_w_file/test_podman_compose_extends_w_file.py b/tests/integration/extends_w_file/test_podman_compose_extends_w_file.py index a57f51c..406617c 100644 --- a/tests/integration/extends_w_file/test_podman_compose_extends_w_file.py +++ b/tests/integration/extends_w_file/test_podman_compose_extends_w_file.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/extends_w_file_subdir/test_podman_compose_extends_w_file_subdir.py b/tests/integration/extends_w_file_subdir/test_podman_compose_extends_w_file_subdir.py index 23f2638..a188d06 100644 --- a/tests/integration/extends_w_file_subdir/test_podman_compose_extends_w_file_subdir.py +++ b/tests/integration/extends_w_file_subdir/test_podman_compose_extends_w_file_subdir.py @@ -4,9 +4,9 @@ import os import unittest from pathlib import Path -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/filesystem/test_podman_compose_filesystem.py b/tests/integration/filesystem/test_podman_compose_filesystem.py index afd806c..d78e369 100644 --- a/tests/integration/filesystem/test_podman_compose_filesystem.py +++ b/tests/integration/filesystem/test_podman_compose_filesystem.py @@ -4,9 +4,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestFilesystem(unittest.TestCase, RunSubprocessMixin): diff --git a/tests/integration/interpolation/test_podman_compose_interpolation.py b/tests/integration/interpolation/test_podman_compose_interpolation.py index 53eb9ac..4dbf682 100644 --- a/tests/integration/interpolation/test_podman_compose_interpolation.py +++ b/tests/integration/interpolation/test_podman_compose_interpolation.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/ipam_default/test_podman_compose_ipam_default.py b/tests/integration/ipam_default/test_podman_compose_ipam_default.py index 1cafb7a..18ad0d0 100644 --- a/tests/integration/ipam_default/test_podman_compose_ipam_default.py +++ b/tests/integration/ipam_default/test_podman_compose_ipam_default.py @@ -4,9 +4,9 @@ import json 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/lifetime/test_lifetime.py b/tests/integration/lifetime/test_lifetime.py index 996f5ee..6d29f05 100644 --- a/tests/integration/lifetime/test_lifetime.py +++ b/tests/integration/lifetime/test_lifetime.py @@ -6,9 +6,9 @@ import unittest from parameterized import parameterized -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestLifetime(unittest.TestCase, RunSubprocessMixin): diff --git a/tests/integration/multicompose/test_podman_compose_multicompose.py b/tests/integration/multicompose/test_podman_compose_multicompose.py index 339292a..d400ecf 100644 --- a/tests/integration/multicompose/test_podman_compose_multicompose.py +++ b/tests/integration/multicompose/test_podman_compose_multicompose.py @@ -3,9 +3,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/nethost/test_podman_compose_nethost.py b/tests/integration/nethost/test_podman_compose_nethost.py index fe93aae..e8c232d 100644 --- a/tests/integration/nethost/test_podman_compose_nethost.py +++ b/tests/integration/nethost/test_podman_compose_nethost.py @@ -5,9 +5,9 @@ import unittest import requests -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/nets_test1/test_podman_compose_nets_test1.py b/tests/integration/nets_test1/test_podman_compose_nets_test1.py index 652ebce..916be05 100644 --- a/tests/integration/nets_test1/test_podman_compose_nets_test1.py +++ b/tests/integration/nets_test1/test_podman_compose_nets_test1.py @@ -6,9 +6,9 @@ import unittest import requests -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/nets_test2/test_podman_compose_nets_test2.py b/tests/integration/nets_test2/test_podman_compose_nets_test2.py index e9b0a8a..73590ba 100644 --- a/tests/integration/nets_test2/test_podman_compose_nets_test2.py +++ b/tests/integration/nets_test2/test_podman_compose_nets_test2.py @@ -6,9 +6,9 @@ import unittest import requests -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/network/test_podman_compose_network.py b/tests/integration/network/test_podman_compose_network.py index a7d251b..b9dc4d9 100644 --- a/tests/integration/network/test_podman_compose_network.py +++ b/tests/integration/network/test_podman_compose_network.py @@ -10,9 +10,9 @@ Tests the podman networking parameters 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestPodmanComposeNetwork(RunSubprocessMixin, unittest.TestCase): diff --git a/tests/integration/network_scoped_aliases/test_podman_compose_network_scoped_aliases.py b/tests/integration/network_scoped_aliases/test_podman_compose_network_scoped_aliases.py index 8e478fa..804d77a 100644 --- a/tests/integration/network_scoped_aliases/test_podman_compose_network_scoped_aliases.py +++ b/tests/integration/network_scoped_aliases/test_podman_compose_network_scoped_aliases.py @@ -4,9 +4,9 @@ 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestPodmanComposeNetworkScopedAliases(RunSubprocessMixin, unittest.TestCase): diff --git a/tests/integration/ports/test_podman_compose_ports.py b/tests/integration/ports/test_podman_compose_ports.py index 0f08b68..aa0b13e 100644 --- a/tests/integration/ports/test_podman_compose_ports.py +++ b/tests/integration/ports/test_podman_compose_ports.py @@ -10,9 +10,9 @@ Tests the podman compose up and down commands used to create and remove services 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestPodmanCompose(unittest.TestCase, RunSubprocessMixin): diff --git a/tests/integration/profile/test_podman_compose_config.py b/tests/integration/profile/test_podman_compose_config.py index 8a7b637..b1d1f56 100644 --- a/tests/integration/profile/test_podman_compose_config.py +++ b/tests/integration/profile/test_podman_compose_config.py @@ -12,9 +12,9 @@ import unittest from parameterized import parameterized -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def profile_compose_file(): diff --git a/tests/integration/profile/test_podman_compose_up_down.py b/tests/integration/profile/test_podman_compose_up_down.py index f2f554c..be95f13 100644 --- a/tests/integration/profile/test_podman_compose_up_down.py +++ b/tests/integration/profile/test_podman_compose_up_down.py @@ -12,9 +12,9 @@ import unittest from parameterized import parameterized -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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path def profile_compose_file(): diff --git a/tests/integration/test_podman_compose.py b/tests/integration/test_podman_compose.py deleted file mode 100644 index 69a5fb6..0000000 --- a/tests/integration/test_podman_compose.py +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -import os -import unittest -from pathlib import Path - - -def base_path(): - """Returns the base path for the project""" - return Path(__file__).parent.parent.parent - - -def test_path(): - """Returns the path to the tests directory""" - return os.path.join(base_path(), "tests/integration") - - -def podman_compose_path(): - """Returns the path to the podman compose script""" - return os.path.join(base_path(), "podman_compose.py") diff --git a/tests/integration/test_utils.py b/tests/integration/test_utils.py index c0faf32..475762d 100644 --- a/tests/integration/test_utils.py +++ b/tests/integration/test_utils.py @@ -3,6 +3,22 @@ import os import subprocess import time +from pathlib import Path + + +def base_path(): + """Returns the base path for the project""" + return Path(__file__).parent.parent.parent + + +def test_path(): + """Returns the path to the tests directory""" + return os.path.join(base_path(), "tests/integration") + + +def podman_compose_path(): + """Returns the path to the podman compose script""" + return os.path.join(base_path(), "podman_compose.py") class RunSubprocessMixin: diff --git a/tests/integration/ulimit_build/test_podman_compose_build_ulimits.py b/tests/integration/ulimit_build/test_podman_compose_build_ulimits.py index d578d77..f805f82 100644 --- a/tests/integration/ulimit_build/test_podman_compose_build_ulimits.py +++ b/tests/integration/ulimit_build/test_podman_compose_build_ulimits.py @@ -7,8 +7,8 @@ import os import subprocess 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 podman_compose_path +from tests.integration.test_utils import test_path def compose_yaml_path(): diff --git a/tests/integration/vol/test_podman_compose_vol.py b/tests/integration/vol/test_podman_compose_vol.py index 9636039..31c1e8b 100644 --- a/tests/integration/vol/test_podman_compose_vol.py +++ b/tests/integration/vol/test_podman_compose_vol.py @@ -10,9 +10,9 @@ Tests the podman compose up and down commands used to create and remove services 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 +from tests.integration.test_utils import podman_compose_path +from tests.integration.test_utils import test_path class TestPodmanCompose(unittest.TestCase, RunSubprocessMixin):