]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: minor cleanup in test_migration
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 24 Jul 2020 14:17:45 +0000 (16:17 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 30 Jul 2020 12:31:39 +0000 (14:31 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/cephadm/tests/test_migration.py

index 3a8674e70935083cb0ea4b28878524019b7741b3..5b78987c7287859ff9806d43bdac7f253056aab3 100644 (file)
@@ -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