mgr/cephadm: also mock `ceph vesions`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1c8cb204ffdb654a2b954a3d39a1c1712c151684)

diff --git a/src/pybind/mgr/cephadm/tests/test_upgrade.py b/src/pybind/mgr/cephadm/tests/test_upgrade.py
index 3bef0844ed33ee80934fc42f81f1dc52accf952e..44e340ce29173c83d124b3522f8df90581b844a6 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_upgrade.py
+++ b/src/pybind/mgr/cephadm/tests/test_upgrade.py
@@ -33,6 +33,15 @@ def test_upgrade_run(cephadm_module: CephadmOrchestrator):
 
             assert wait(cephadm_module, cephadm_module.upgrade_status()).target_image == 'to_image'
 
+            def _versions_mock(cmd):
+                return json.dumps({
+                    'mgr': {
+                        'myversion': 1
+                    }
+                })
+
+            cephadm_module._mon_command_mock_versions = _versions_mock
+
             cephadm_module.upgrade._do_upgrade()
 
             _, image, _ = cephadm_module.check_mon_command({

diff --git a/src/pybind/mgr/tests/__init__.py b/src/pybind/mgr/tests/__init__.py
index a34dbe9dc5a4ebf96e66b0a2cc5af9d1d23a7444..7b6fb41b2258a7e0a2e0f88509c7f46d3c7eb496 100644 (file)
--- a/src/pybind/mgr/tests/__init__.py
+++ b/src/pybind/mgr/tests/__init__.py
@@ -130,6 +130,9 @@ if 'UNITTEST' in os.environ:
                 outb = config_set()
             elif cmd['prefix'] == 'config dump':
                 outb = config_dump()
+            elif hasattr(self, '_mon_command_mock_' + cmd['prefix'].replace(' ', '_')):
+                a = getattr(self, '_mon_command_mock_' + cmd['prefix'].replace(' ', '_'))
+                outb = a(cmd)
 
             res.complete(0, outb, '')