From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 27 Sep 2022 18:51:00 +0000 (-0400)
Subject: cephadm: rename import from cephadm to _cephadm
X-Git-Tag: v18.1.0~1104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48260%2Fhead;p=ceph.git

cephadm: rename import from cephadm to _cephadm

To be consistent with the other test_*.py files.

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

diff --git a/src/cephadm/tests/test_container_engine.py b/src/cephadm/tests/test_container_engine.py
index ce095c1975cc..433f0127001b 100644
--- a/src/cephadm/tests/test_container_engine.py
+++ b/src/cephadm/tests/test_container_engine.py
@@ -4,14 +4,14 @@ import pytest
 
 from tests.fixtures import with_cephadm_ctx, import_cephadm
 
-cephadm = import_cephadm()
+_cephadm = import_cephadm()
 
 
 def test_container_engine():
     with pytest.raises(NotImplementedError):
-        cephadm.ContainerEngine()
+        _cephadm.ContainerEngine()
 
-    class PhonyContainerEngine(cephadm.ContainerEngine):
+    class PhonyContainerEngine(_cephadm.ContainerEngine):
         EXE = "true"
 
     with mock.patch("cephadm.find_program") as find_program:
@@ -23,7 +23,7 @@ def test_container_engine():
 def test_podman():
     with mock.patch("cephadm.find_program") as find_program:
         find_program.return_value = "/usr/bin/podman"
-        pm = cephadm.Podman()
+        pm = _cephadm.Podman()
         find_program.assert_called()
         with pytest.raises(RuntimeError):
             pm.version
@@ -38,7 +38,7 @@ def test_podman():
 def test_podman_badversion():
     with mock.patch("cephadm.find_program") as find_program:
         find_program.return_value = "/usr/bin/podman"
-        pm = cephadm.Podman()
+        pm = _cephadm.Podman()
         find_program.assert_called()
         with mock.patch("cephadm.call_throws") as call_throws:
             call_throws.return_value = ("4.10.beta2", None, None)
@@ -50,5 +50,5 @@ def test_podman_badversion():
 def test_docker():
     with mock.patch("cephadm.find_program") as find_program:
         find_program.return_value = "/usr/bin/docker"
-        docker = cephadm.Docker()
+        docker = _cephadm.Docker()
         assert str(docker) == "docker (/usr/bin/docker)"