From: Michael Fritch <mfritch@suse.com>
Date: Thu, 19 Dec 2019 14:45:45 +0000 (-0700)
Subject: cephadm: Rename tox tests ceph-daemon -> cephadm
X-Git-Tag: v15.1.0~421^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcf8d6173f596c3988775798393037a62b2db2fa;p=ceph.git

cephadm: Rename tox tests ceph-daemon -> cephadm

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/tests/test_ceph_daemon.py b/src/cephadm/tests/test_ceph_daemon.py
deleted file mode 100644
index 8adafe6fb7f3..000000000000
--- a/src/cephadm/tests/test_ceph_daemon.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import argparse
-import mock
-import os
-import sys
-import unittest
-
-import pytest
-
-if sys.version_info >= (3, 3):
-    from importlib.machinery import SourceFileLoader
-    cd = SourceFileLoader('cephadm', 'cephadm').load_module()
-else:
-    import imp
-    cd = imp.load_source('cephadm', 'cephadm')
-
-class TestCephDaemon(unittest.TestCase):
-    def test_is_fsid(self):
-        self.assertFalse(cd.is_fsid('no-uuid'))
-
-    def test__get_parser_image(self):
-        p = cd._get_parser()
-        args = p.parse_args(['--image', 'foo', 'version'])
-        assert args.image == 'foo'
-
-    @mock.patch.dict(os.environ,{'CEPHADM_IMAGE':'bar'})
-    def test__get_parser_image_with_envvar(self):
-        p = cd._get_parser()
-        args = p.parse_args(['version'])
-        assert args.image == 'bar'
-
-    def test_CustomValidation(self):
-        p = cd._get_parser()
-        assert p.parse_args(['deploy', '--name', 'mon.a', '--fsid', 'fsid'])
-
-        with pytest.raises(SystemExit):
-            p.parse_args(['deploy', '--name', 'wrong', '--fsid', 'fsid'])
diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py
new file mode 100644
index 000000000000..d9bc45ce6f19
--- /dev/null
+++ b/src/cephadm/tests/test_cephadm.py
@@ -0,0 +1,36 @@
+import argparse
+import mock
+import os
+import sys
+import unittest
+
+import pytest
+
+if sys.version_info >= (3, 3):
+    from importlib.machinery import SourceFileLoader
+    cd = SourceFileLoader('cephadm', 'cephadm').load_module()
+else:
+    import imp
+    cd = imp.load_source('cephadm', 'cephadm')
+
+class TestCephAdm(unittest.TestCase):
+    def test_is_fsid(self):
+        self.assertFalse(cd.is_fsid('no-uuid'))
+
+    def test__get_parser_image(self):
+        p = cd._get_parser()
+        args = p.parse_args(['--image', 'foo', 'version'])
+        assert args.image == 'foo'
+
+    @mock.patch.dict(os.environ,{'CEPHADM_IMAGE':'bar'})
+    def test__get_parser_image_with_envvar(self):
+        p = cd._get_parser()
+        args = p.parse_args(['version'])
+        assert args.image == 'bar'
+
+    def test_CustomValidation(self):
+        p = cd._get_parser()
+        assert p.parse_args(['deploy', '--name', 'mon.a', '--fsid', 'fsid'])
+
+        with pytest.raises(SystemExit):
+            p.parse_args(['deploy', '--name', 'wrong', '--fsid', 'fsid'])