tests/integration: Move test utils to one test_utils file

Signed-off-by: Monika Kairaityte <monika@kibit.lt>

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_utils import podman_compose_path
-from tests.integration.test_podman_compose import test_path
+from tests.integration.test_utils import test_path
 
 
 def compose_yaml_path():

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_utils import podman_compose_path
-from tests.integration.test_podman_compose import test_path
+from tests.integration.test_utils import test_path
 from tests.integration.test_utils import RunSubprocessMixin
 
 

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():

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):

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_utils import podman_compose_path
-from tests.integration.test_podman_compose import test_path
+from tests.integration.test_utils import test_path
 
 
 def compose_yaml_path():

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",

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):

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=""):

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():

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():

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():

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():

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():

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():

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():

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):

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():

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():

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):

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():

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():

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():

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():

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):

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):

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):

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():

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():

tests/integration/test_podman_compose.py

@@ -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")

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:

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_utils import podman_compose_path
-from tests.integration.test_podman_compose import test_path
+from tests.integration.test_utils import test_path
 
 
 def compose_yaml_path():

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):