From: Joshua Schmid Date: Tue, 11 Aug 2020 07:53:23 +0000 (+0200) Subject: mgr/cephadm: add default osdspec_affinity to module fixture X-Git-Tag: v15.2.5~26^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19533ee1c2983f6b2ae139324afb759b490fb1dd;p=ceph.git mgr/cephadm: add default osdspec_affinity to module fixture Signed-off-by: Joshua Schmid (cherry picked from commit eb1b37cfc34db90db86ef8449f645d5a192656b9) --- diff --git a/src/pybind/mgr/cephadm/tests/fixtures.py b/src/pybind/mgr/cephadm/tests/fixtures.py index 045a3015dc0..ca15d4e3976 100644 --- a/src/pybind/mgr/cephadm/tests/fixtures.py +++ b/src/pybind/mgr/cephadm/tests/fixtures.py @@ -43,6 +43,7 @@ def with_cephadm_module(module_options=None, store=None): with mock.patch("cephadm.module.CephadmOrchestrator.get_ceph_option", get_ceph_option),\ mock.patch("cephadm.services.osd.RemoveUtil._run_mon_cmd"), \ mock.patch("cephadm.module.CephadmOrchestrator.get_osdmap"), \ + mock.patch("cephadm.services.osd.OSDService.get_osdspec_affinity", return_value='test_spec'), \ mock.patch("cephadm.module.CephadmOrchestrator.remote"): m = CephadmOrchestrator.__new__ (CephadmOrchestrator)