From 1c8cb204ffdb654a2b954a3d39a1c1712c151684 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 17 Aug 2020 13:07:03 +0200 Subject: [PATCH] mgr/cephadm: also mock `ceph vesions` Signed-off-by: Sebastian Wagner --- src/pybind/mgr/cephadm/tests/test_upgrade.py | 9 +++++++++ src/pybind/mgr/tests/__init__.py | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/pybind/mgr/cephadm/tests/test_upgrade.py b/src/pybind/mgr/cephadm/tests/test_upgrade.py index 3bef0844ed33..44e340ce2917 100644 --- 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 a34dbe9dc5a4..7b6fb41b2258 100644 --- 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, '') -- 2.47.3