diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-30 17:46:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-30 17:46:39 +0000 |
| commit | f354d93d84b3ff933a074b2209c43732f257c90c (patch) | |
| tree | 3e0cc32fe8e14f58ff89fbcee63cc9132a5b0f54 /ironic | |
| parent | edaf5ad7c06949233a8bca0132d89eca552e7fae (diff) | |
| parent | e9de066b90e82f5407e8dfe1c024e85ffb4c6c3a (diff) | |
| download | ironic-f354d93d84b3ff933a074b2209c43732f257c90c.tar.gz | |
Merge "Fix test node manager"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/tests/conductor/test_node_manager.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/ironic/tests/conductor/test_node_manager.py b/ironic/tests/conductor/test_node_manager.py index 75937d2b4..bf104116d 100644 --- a/ironic/tests/conductor/test_node_manager.py +++ b/ironic/tests/conductor/test_node_manager.py @@ -44,9 +44,6 @@ class NodeManagerTestCase(base.TestCase): self.dbapi = mock.MagicMock() self.dbapi.get_instance.return_value = mock.MagicMock(**db_keys) - def _fake_init(*args, **kwargs): - return None - def test_node_manager_init_id(self): NodeManager = resource_manager.NodeManager DriverFactory = driver_factory.DriverFactory @@ -133,11 +130,10 @@ class NodeManagerTestCase(base.TestCase): mock.patch.object(DriverFactory, '_extension_manager', new=self.driver_factory), - mock.patch.object(NodeManager, - '__init__', - new=self._fake_init) + mock.patch("ironic.conductor.resource_manager.dbapi", + self.dbapi) ): - node_manager = NodeManager() + node_manager = NodeManager(id=self.test_id, t=self.test_task) self.assertEqual(node_manager.load_driver( self.existing_driver_name ), @@ -151,11 +147,10 @@ class NodeManagerTestCase(base.TestCase): mock.patch.object(DriverFactory, '_extension_manager', new=self.driver_factory), - mock.patch.object(NodeManager, - '__init__', - new=self._fake_init) + mock.patch("ironic.conductor.resource_manager.dbapi", + self.dbapi) ): - node_manager = NodeManager() + node_manager = NodeManager(id=self.test_id, t=self.test_task) self.assertRaises(exception.DriverNotFound, node_manager.load_driver, self.non_existing_driver_name) |