From: Sebastian Wagner Date: Fri, 24 Jul 2020 14:17:45 +0000 (+0200) Subject: mgr/cephadm: minor cleanup in test_migration X-Git-Tag: v16.1.0~1563^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=775d5bedad2703014878d7744d23a25d13bd9bde;p=ceph.git mgr/cephadm: minor cleanup in test_migration Signed-off-by: Sebastian Wagner --- diff --git a/src/pybind/mgr/cephadm/tests/test_migration.py b/src/pybind/mgr/cephadm/tests/test_migration.py index 3a8674e70935..5b78987c7287 100644 --- a/src/pybind/mgr/cephadm/tests/test_migration.py +++ b/src/pybind/mgr/cephadm/tests/test_migration.py @@ -2,13 +2,12 @@ from datetime import datetime from ceph.deployment.service_spec import PlacementSpec, ServiceSpec, HostPlacementSpec from cephadm import CephadmOrchestrator -from cephadm.tests.fixtures import _run_cephadm, cephadm_module, wait, match_glob, with_host -from orchestrator import ServiceDescription +from cephadm.tests.fixtures import _run_cephadm, cephadm_module, wait, with_host from tests import mock @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('[]')) @mock.patch("cephadm.services.cephadmservice.RgwService.create_realm_zonegroup_zone", lambda _,__,___: None) -def test_service_ls(cephadm_module: CephadmOrchestrator): +def test_migrate_scheduler(cephadm_module: CephadmOrchestrator): with with_host(cephadm_module, 'host1'): with with_host(cephadm_module, 'host2'): @@ -44,7 +43,3 @@ def test_service_ls(cephadm_module: CephadmOrchestrator): out = [o.spec.placement for o in wait(cephadm_module, cephadm_module.describe_service())] assert out == [PlacementSpec(count=2, hosts=[HostPlacementSpec(hostname='host1', network='', name=''), HostPlacementSpec(hostname='host2', network='', name='')])] - - -# assert_rm_service(cephadm_module, 'rgw.r.z') -# assert_rm_daemon(cephadm_module, 'mds.name', 'test') \ No newline at end of file