import ceph 16.2.7

[ceph.git] / ceph / src / pybind / mgr / dashboard / tests / test_rbd_mirroring.py

diff --git a/ceph/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py b/ceph/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
index 9f83bad83e1236ed0601d85cb488bf000ed89100..e064089706a644a1cde5ae5f7bbbd0193d55310b 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
+++ b/ceph/src/pybind/mgr/dashboard/tests/test_rbd_mirroring.py
@@ -11,7 +11,7 @@ from .. import mgr
 from ..controllers.rbd_mirroring import RbdMirroring, RbdMirroringPoolBootstrap, RbdMirroringSummary
 from ..controllers.summary import Summary
 from ..services import progress
-from . import ControllerTestCase  # pylint: disable=no-name-in-module
+from ..tests import ControllerTestCase
 
 mock_list_servers = [{
     'hostname': 'ceph-host',
@@ -51,10 +51,6 @@ class RbdMirroringControllerTest(ControllerTestCase):
 
     @classmethod
     def setup_server(cls):
-        # pylint: disable=protected-access
-        RbdMirroring._cp_config['tools.authenticate.on'] = False
-        # pylint: enable=protected-access
-
         cls.setup_controllers([RbdMirroring])
 
     @mock.patch('dashboard.controllers.rbd_mirroring.rbd.RBD')
@@ -82,10 +78,6 @@ class RbdMirroringPoolBootstrapControllerTest(ControllerTestCase):
 
     @classmethod
     def setup_server(cls):
-        # pylint: disable=protected-access
-        RbdMirroringPoolBootstrap._cp_config['tools.authenticate.on'] = False
-        # pylint: enable=protected-access
-
         cls.setup_controllers([RbdMirroringPoolBootstrap])
 
     @mock.patch('dashboard.controllers.rbd_mirroring.rbd.RBD')
@@ -149,11 +141,6 @@ class RbdMirroringSummaryControllerTest(ControllerTestCase):
         progress.get_progress_tasks = mock.MagicMock()
         progress.get_progress_tasks.return_value = ([], [])
 
-        # pylint: disable=protected-access
-        RbdMirroringSummary._cp_config['tools.authenticate.on'] = False
-        Summary._cp_config['tools.authenticate.on'] = False
-        # pylint: enable=protected-access
-
         cls.setup_controllers([RbdMirroringSummary, Summary], '/test')
 
     @mock.patch('dashboard.controllers.rbd_mirroring.rbd.RBD')