From: John Mulligan <jmulligan@redhat.com>
Date: Mon, 26 Sep 2022 15:20:58 +0000 (-0400)
Subject: cephadm: use import_cephadm function in test_*.py files
X-Git-Tag: v18.1.0~1104^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0893e7558d99b8b5d3ef72eb1e270bcc84a6b9a;p=ceph.git

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 05a83923b4a0..bd65ee84f79f 100644
--- 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 c0e0370b62bf..ce095c1975cc 100644
--- 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 4b3fb0d212dd..ffe8ff6fc7a3 100644
--- 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 a1bcf34e12da..8a4e74b40dea 100644
--- 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: