import ceph 16.2.7

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

diff --git a/ceph/src/pybind/mgr/dashboard/tests/test_iscsi.py b/ceph/src/pybind/mgr/dashboard/tests/test_iscsi.py
index 4060c6c4a044cc4c752e7fa60e417b1e47445c02..7728a496b9ebbf14cbf879f1e2b50a041042f8c9 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/tests/test_iscsi.py
+++ b/ceph/src/pybind/mgr/dashboard/tests/test_iscsi.py
@@ -17,11 +17,8 @@ from ..controllers.iscsi import Iscsi, IscsiTarget
 from ..rest_client import RequestException
 from ..services.iscsi_client import IscsiClient
 from ..services.orchestrator import OrchClient
+from ..tests import CLICommandTestMixin, CmdException, ControllerTestCase, KVStoreMockMixin
 from ..tools import NotificationQueue, TaskManager
-from . import CLICommandTestMixin  # pylint: disable=no-name-in-module
-from . import CmdException  # pylint: disable=no-name-in-module
-from . import ControllerTestCase  # pylint: disable=no-name-in-module
-from . import KVStoreMockMixin  # pylint: disable=no-name-in-module
 
 
 class IscsiTestCli(unittest.TestCase, CLICommandTestMixin):
@@ -84,9 +81,6 @@ class IscsiTestController(ControllerTestCase, KVStoreMockMixin):
         TaskManager.init()
         OrchClient.instance().available = lambda: False
         mgr.rados.side_effect = None
-        # pylint: disable=protected-access
-        Iscsi._cp_config['tools.authenticate.on'] = False
-        IscsiTarget._cp_config['tools.authenticate.on'] = False
         cls.setup_controllers([Iscsi, IscsiTarget])
 
     @classmethod