From: John Mulligan Date: Sat, 20 May 2023 17:45:10 +0000 (-0400) Subject: cephadm: convert test case to call command_deploy_from X-Git-Tag: v18.2.1~326^2~50 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c6f27e40cdc0aef01ff727c1b22cf78e05da8366;p=ceph.git cephadm: convert test case to call command_deploy_from The test was previously using command_deploy but that is being deprecated so call command_deploy_from instead. Signed-off-by: John Mulligan --- diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py index a66bac9630a96..ae1c18249be4f 100644 --- a/src/cephadm/tests/test_cephadm.py +++ b/src/cephadm/tests/test_cephadm.py @@ -312,6 +312,8 @@ class TestCephAdm(object): @mock.patch('cephadm.check_unit', lambda *args, **kwargs: (None, 'running', None)) @mock.patch('cephadm.get_unit_name', lambda *args, **kwargs: 'mon-unit-name') @mock.patch('cephadm.get_deployment_container') + @mock.patch('cephadm.read_configuration_source', lambda c: {}) + @mock.patch('cephadm.apply_deploy_config_to_ctx', lambda d, c: None) def test_mon_crush_location(self, _get_deployment_container, _migrate_sysctl, _make_var_run, _get_parm, _deploy_daemon, _file_lock, _logger): """ test that crush location for mon is set if it is included in config_json @@ -353,7 +355,7 @@ class TestCephAdm(object): _deploy_daemon.side_effect = _crush_location_checker with pytest.raises(Exception, match='--set-crush-location database=a'): - _cephadm.command_deploy(ctx) + _cephadm.command_deploy_from(ctx) @mock.patch('cephadm.logger') @mock.patch('cephadm.fetch_custom_config_files')