cephadm: use import_cephadm function in test_*.py files

Any current or future chicanery needed to import cephadm is now isolated
in one place, and doesn't need to be repeated in every file.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py
index 05a83923b4a0a6c726ace431f7570478e174bf4e..bd65ee84f79fd11b06852dfadc4535488a03e5c1 100644 (file)
--- a/src/cephadm/tests/test_cephadm.py
+++ b/src/cephadm/tests/test_cephadm.py
@@ -15,13 +15,12 @@ from .fixtures import (
     mock_podman,
     with_cephadm_ctx,
     mock_bad_firewalld,
+    import_cephadm,
 )
 
 from pyfakefs import fake_filesystem_unittest
 
-with mock.patch('builtins.open', create=True):
-    from importlib.machinery import SourceFileLoader
-    cd = SourceFileLoader('cephadm', 'cephadm.py').load_module()
+cd = import_cephadm()
 
 
 def get_ceph_conf(

diff --git a/src/cephadm/tests/test_container_engine.py b/src/cephadm/tests/test_container_engine.py
index c0e0370b62bfab2f0cabb73a42ed8f290e20a0c4..ce095c1975cc58c1d68a1a461d272f9658395bcc 100644 (file)
--- a/src/cephadm/tests/test_container_engine.py
+++ b/src/cephadm/tests/test_container_engine.py
@@ -2,12 +2,9 @@ from unittest import mock
 
 import pytest
 
-from tests.fixtures import with_cephadm_ctx
+from tests.fixtures import with_cephadm_ctx, import_cephadm
 
-with mock.patch("builtins.open", create=True):
-    from importlib.machinery import SourceFileLoader
-
-    cephadm = SourceFileLoader("cephadm", "cephadm.py").load_module()
+cephadm = import_cephadm()
 
 
 def test_container_engine():

diff --git a/src/cephadm/tests/test_enclosure.py b/src/cephadm/tests/test_enclosure.py
index 4b3fb0d212dd86176159f75cf4e84754d5b0fb70..ffe8ff6fc7a33d67e236c23c16741e12201687c2 100644 (file)
--- a/src/cephadm/tests/test_enclosure.py
+++ b/src/cephadm/tests/test_enclosure.py
@@ -1,11 +1,9 @@
 import pytest
 
 from unittest import mock
-from tests.fixtures import host_sysfs
+from tests.fixtures import host_sysfs, import_cephadm
 
-with mock.patch('builtins.open', create=True):
-    from importlib.machinery import SourceFileLoader
-    cd = SourceFileLoader('cephadm', 'cephadm.py').load_module()
+cd = import_cephadm()
 
 
 @pytest.fixture

diff --git a/src/cephadm/tests/test_networks.py b/src/cephadm/tests/test_networks.py
index a1bcf34e12da11a1ec9ddedbaf4a6bf8b8d2eee7..8a4e74b40deacc6762638ed5873a7670add653c6 100644 (file)
--- a/src/cephadm/tests/test_networks.py
+++ b/src/cephadm/tests/test_networks.py
@@ -4,11 +4,9 @@ from unittest import mock
 
 import pytest
 
-from tests.fixtures import with_cephadm_ctx, cephadm_fs
+from tests.fixtures import with_cephadm_ctx, cephadm_fs, import_cephadm
 
-with mock.patch('builtins.open', create=True):
-    from importlib.machinery import SourceFileLoader
-    cd = SourceFileLoader('cephadm', 'cephadm.py').load_module()
+cd = import_cephadm()
 
 
 class TestCommandListNetworks: