From a4a523d5fb9753945f677d9bd8eabb2e970691af Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Wed, 3 Jun 2020 14:50:40 -0600 Subject: [PATCH] mgr/cephadm: use keyword rather than positional arg use keyword `service_id` during the ServiceSpec tests cephadm/tests/test_cephadm.py:51: in class TestCephadm(object): cephadm/tests/test_cephadm.py:508: in TestCephadm ??? ../../python-common/ceph/deployment/service_spec.py:606: in __init__ assert service_type == 'iscsi' E AssertionError Signed-off-by: Michael Fritch --- src/pybind/mgr/cephadm/tests/test_cephadm.py | 28 +++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py index f3e582867c4..f64d8a0ce90 100644 --- a/src/pybind/mgr/cephadm/tests/test_cephadm.py +++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py @@ -436,7 +436,11 @@ class TestCephadm(object): def test_nfs(self, cephadm_module): with self._with_host(cephadm_module, 'test'): ps = PlacementSpec(hosts=['test'], count=1) - spec = NFSServiceSpec('name', pool='pool', namespace='namespace', placement=ps) + spec = NFSServiceSpec( + service_id='name', + pool='pool', + namespace='namespace', + placement=ps) c = cephadm_module.add_nfs(spec) [out] = wait(cephadm_module, c) match_glob(out, "Deployed nfs.name.* on host 'test'") @@ -453,8 +457,12 @@ class TestCephadm(object): def test_iscsi(self, cephadm_module): with self._with_host(cephadm_module, 'test'): ps = PlacementSpec(hosts=['test'], count=1) - spec = IscsiServiceSpec('name', pool='pool', api_user='user', - api_password='password', placement=ps) + spec = IscsiServiceSpec( + service_id='name', + pool='pool', + api_user='user', + api_password='password', + placement=ps) c = cephadm_module.add_iscsi(spec) [out] = wait(cephadm_module, c) match_glob(out, "Deployed iscsi.name.* on host 'test'") @@ -504,9 +512,17 @@ class TestCephadm(object): )] ) ), CephadmOrchestrator.apply_rgw), - (NFSServiceSpec('name', pool='pool', namespace='namespace'), CephadmOrchestrator.apply_nfs), - (IscsiServiceSpec('name', pool='pool', api_user='user', api_password='password'), - CephadmOrchestrator.apply_iscsi), + (NFSServiceSpec( + service_id='name', + pool='pool', + namespace='namespace' + ), CephadmOrchestrator.apply_nfs), + (IscsiServiceSpec( + service_id='name', + pool='pool', + api_user='user', + api_password='password' + ), CephadmOrchestrator.apply_iscsi), ] ) @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}')) -- 2.39.5