From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 11 Jul 2023 19:45:13 +0000 (-0400)
Subject: cephadm: move unit file related tests to dedicated file
X-Git-Tag: v19.0.0~153^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=519a5f01b623fbf583f81d62593368e6b9a8949c;p=ceph.git

cephadm: move unit file related tests to dedicated 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 7e31b26307c..9d5cbf291e5 100644
--- a/src/cephadm/tests/test_cephadm.py
+++ b/src/cephadm/tests/test_cephadm.py
@@ -38,15 +38,6 @@ def get_ceph_conf(
 
 class TestCephAdm(object):
 
-    def test_docker_unit_file(self):
-        ctx = _cephadm.CephadmContext()
-        ctx.container_engine = mock_docker()
-        r = _cephadm.get_unit_file(ctx, '9b9d7609-f4d5-4aba-94c8-effa764d96c9')
-        assert 'Requires=docker.service' in r
-        ctx.container_engine = mock_podman()
-        r = _cephadm.get_unit_file(ctx, '9b9d7609-f4d5-4aba-94c8-effa764d96c9')
-        assert 'Requires=docker.service' not in r
-
     @mock.patch('cephadm.logger')
     def test_attempt_bind(self, _logger):
         from cephadmlib.net_utils import PortOccupiedError, attempt_bind
diff --git a/src/cephadm/tests/test_unit_file.py b/src/cephadm/tests/test_unit_file.py
new file mode 100644
index 00000000000..cf094c97bc2
--- /dev/null
+++ b/src/cephadm/tests/test_unit_file.py
@@ -0,0 +1,33 @@
+# Tests for various assorted utility functions found within cephadm
+#
+from unittest import mock
+
+import functools
+import io
+import os
+import sys
+
+import pytest
+
+from tests.fixtures import (
+    import_cephadm,
+    mock_docker,
+    mock_podman,
+    with_cephadm_ctx,
+)
+
+_cephadm = import_cephadm()
+
+
+def test_docker_engine_requires_docker():
+    ctx = _cephadm.CephadmContext()
+    ctx.container_engine = mock_docker()
+    r = _cephadm.get_unit_file(ctx, '9b9d7609-f4d5-4aba-94c8-effa764d96c9')
+    assert 'Requires=docker.service' in r
+
+
+def test_podman_engine_does_not_req_docker():
+    ctx = _cephadm.CephadmContext()
+    ctx.container_engine = mock_podman()
+    r = _cephadm.get_unit_file(ctx, '9b9d7609-f4d5-4aba-94c8-effa764d96c9')
+    assert 'Requires=docker.service' not in r