From 7061392061a33540cb213686240ad43e06373516 Mon Sep 17 00:00:00 2001 From: jianglong01 Date: Fri, 11 Jun 2021 10:56:30 +0800 Subject: [PATCH] mgr/cephadm: When test osd active, it need to add "mock call" to make sure execute correctly Signed-off-by: jianglong01 (cherry picked from commit 73dd266dc837b9a11d27ee17cbe75f8b6c36c799) --- src/pybind/mgr/cephadm/tests/test_cephadm.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py index 975659bd59d75..8633d5ef92158 100644 --- a/src/pybind/mgr/cephadm/tests/test_cephadm.py +++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py @@ -1278,8 +1278,17 @@ Traceback (most recent call last): }] } _run_cephadm.return_value = (json.dumps(ceph_volume_lvm_list), '', 0) + _run_cephadm.reset_mock() assert cephadm_module._osd_activate( ['test']).stdout == "Created osd(s) 1 on host 'test'" + assert _run_cephadm.mock_calls == [ + mock.call('test', 'osd', 'ceph-volume', + ['--', 'lvm', 'list', '--format', 'json'], no_fsid=False, image=''), + mock.call('test', 'osd.1', 'deploy', + ['--name', 'osd.1', '--meta-json', mock.ANY, + '--config-json', '-', '--osd-fsid', 'uuid'], + stdin=mock.ANY, image=''), + ] @mock.patch("cephadm.serve.CephadmServe._run_cephadm") def test_osd_activate_datadevice_dbdevice(self, _run_cephadm, cephadm_module: CephadmOrchestrator): @@ -1311,5 +1320,14 @@ Traceback (most recent call last): }] } _run_cephadm.return_value = (json.dumps(ceph_volume_lvm_list), '', 0) + _run_cephadm.reset_mock() assert cephadm_module._osd_activate( ['test']).stdout == "Created osd(s) 1 on host 'test'" + assert _run_cephadm.mock_calls == [ + mock.call('test', 'osd', 'ceph-volume', + ['--', 'lvm', 'list', '--format', 'json'], no_fsid=False, image=''), + mock.call('test', 'osd.1', 'deploy', + ['--name', 'osd.1', '--meta-json', mock.ANY, + '--config-json', '-', '--osd-fsid', 'uuid'], + stdin=mock.ANY, image=''), + ] -- 2.39.5