From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 11 Feb 2020 11:56:50 +0000 (+0100)
Subject: mgr/cephadm: test_cephadm: simplify matching strings
X-Git-Tag: v15.1.1~451^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=497dde17b29ef9f80112f4aca3c2f2362b4f6094;p=ceph.git

mgr/cephadm: test_cephadm: simplify matching strings

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index 52c5adc8a8c4..4dac6de8b67e 100644
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -1,6 +1,6 @@
 import json
-import time
 from contextlib import contextmanager
+import fnmatch
 
 from ceph.deployment.drive_group import DriveGroupSpec, DeviceSelection
 
@@ -33,6 +33,11 @@ def mon_command(*args, **kwargs):
     return 0, '', ''
 
 
+def match_glob(val, pat):
+    ok = fnmatch.fnmatchcase(val, pat)
+    if not ok:
+        assert pat in val
+
 class TestCephadm(object):
 
     @contextmanager
@@ -46,9 +51,7 @@ class TestCephadm(object):
             ServiceDescription(service_instance='mon.a')
         ]
         new_mon = cephadm_module.get_unique_name('myhost', existing, 'mon')
-        assert new_mon.startswith('mon.')
-        assert new_mon != 'mon.a'
-        assert '.myhost.' in new_mon
+        match_glob(new_mon, 'mon.myhost.*')
 
     @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('[]'))
@@ -117,8 +120,8 @@ class TestCephadm(object):
             ps = PlacementSpec(hosts=['test:0.0.0.0=a'], count=1)
             c = cephadm_module.update_mgrs(ServiceSpec(placement=ps))
             [out] = wait(cephadm_module, c)
-            assert "Deployed mgr." in out
-            assert " on host 'test'" in out
+            match_glob(out, "Deployed mgr.* on host 'test'")
+
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
@@ -159,8 +162,7 @@ class TestCephadm(object):
             ps = PlacementSpec(hosts=['test'], count=1)
             c = cephadm_module.add_mds(ServiceSpec('name', placement=ps))
             [out] = wait(cephadm_module, c)
-            assert "Deployed mds.name." in out
-            assert " on host 'test'" in out
+            match_glob(out, "Deployed mds.name.* on host 'test'")
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
@@ -204,8 +206,8 @@ class TestCephadm(object):
             ps = PlacementSpec(hosts=['test'], count=1)
             c = cephadm_module.add_rbd_mirror(ServiceSpec(name='name', placement=ps))
             [out] = wait(cephadm_module, c)
-            assert "Deployed rbd-mirror." in out
-            assert " on host 'test'" in out
+            match_glob(out, "Deployed rbd-mirror.* on host 'test'")
+
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     @mock.patch("cephadm.module.CephadmOrchestrator.send_command")