Merge lp:~gandelman-a/ironic/icehouse_rc2 into lp:~ubuntu-server-dev/ironic/icehouse

[Adam Gandelman]

RC2 and some minor fixes, including a cherry-picked patch that will fix a potential for memory exhaustion during test suite run (saw this a few times on PPA buildds)

[Martin Pitt (pitti)]

ironic is much newer in wily, and for trusty we probably won't update to newer upstream versions any more, so this seems obsolete. If this is still relevant, please reopen.

Unmerged revisions

18. By Adam Gandelman on 2014-04-15

d/control: Fix lintian warnings: bump debhelper version requirement
and standards version.

17. By Adam Gandelman on 2014-04-15

d/control: Bump standards to 3.9.5.

16. By Adam Gandelman on 2014-04-15

d/p/cleanup_conductors_in_tests.patch: Cherry-pick upstream patch that
fixes possible memory exhaustion and deadlock during test suite runs.

15. By Adam Gandelman on 2014-04-15

New upstream release.

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-04 18:58:26 +0000
+++ debian/changelog	2014-04-15 23:19:36 +0000
@@ -1,3 +1,13 @@
+ironic (2014.1~rc2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release.
+  * d/p/cleanup_conductors_in_tests.patch: Cherry-pick upstream patch that
+    fixes possible memory exhaustion and deadlock during test suite runs.
+  * d/control: Fix lintian warnings: bump debhelper version requirement
+    and standards version.
+
+ -- Adam Gandelman <[e-mail]>  Tue, 15 Apr 2014 16:04:16 -0700
+
 ironic (2014.1~rc1-0ubuntu1) trusty; urgency=medium
 
   [ Adam Gandelman ]

=== modified file 'debian/control'
--- debian/control	2014-04-04 18:16:52 +0000
+++ debian/control	2014-04-15 23:19:36 +0000
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Chuck Short <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9.0.0),
  alembic (>= 0.4.1),
  python-setuptools,
  python-all (>= 2.6),
@@ -40,7 +40,7 @@
  python-subunit,
  testrepository (>= 0.0.17),
  python-testtools (>= 0.9.32)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/ironic/icehouse/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ironic/icehouse
 

=== added file 'debian/patches/cleanup_conductors_in_tests.patch'
--- debian/patches/cleanup_conductors_in_tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/cleanup_conductors_in_tests.patch	2014-04-15 23:19:36 +0000
@@ -0,0 +1,524 @@
+From a4cf03c7e66a829400d69da295f54f5c2beb6812 Mon Sep 17 00:00:00 2001
+From: Adam Gandelman <[e-mail]>
+Date: Wed, 9 Apr 2014 16:50:05 -0700
+Subject: [PATCH 1/1] Cleanup running conductor services in tests
+
+The conductor manager tests are not stopping services that are
+started, instead relying strickly on database cleanup.  This is
+causing condcutor periodic tasks to bleed into other test cases
+and cause occasional unrelated deadlocks in logging later on during
+test runs.
+
+Change-Id: I7502df5dec7c42fe1a20bebad8f9ad393572d17d
+Closes-bug: #1300420
+---
+ ironic/tests/conductor/test_manager.py | 121 ++++++++++++++++++---------------
+ 1 file changed, 66 insertions(+), 55 deletions(-)
+
+diff --git a/ironic/tests/conductor/test_manager.py b/ironic/tests/conductor/test_manager.py
+index 307b7c9..68e2ba3 100644
+--- a/ironic/tests/conductor/test_manager.py
++++ b/ironic/tests/conductor/test_manager.py
+@@ -55,16 +55,27 @@ class ManagerTestCase(base.DbTestCase):
+         mgr_utils.mock_the_extension_manager()
+         self.driver = driver_factory.get_driver("fake")
+ 
++    def _stop_service(self):
++        try:
++            self.dbapi.get_conductor(self.hostname)
++        except exception.ConductorNotFound:
++            return
++        self.service.stop()
++
++    def _start_service(self):
++        self.service.start()
++        self.addCleanup(self._stop_service)
++
+     def test_start_registers_conductor(self):
+         self.assertRaises(exception.ConductorNotFound,
+                           self.dbapi.get_conductor,
+                           self.hostname)
+-        self.service.start()
++        self._start_service()
+         res = self.dbapi.get_conductor(self.hostname)
+         self.assertEqual(self.hostname, res['hostname'])
+ 
+     def test_stop_unregisters_conductor(self):
+-        self.service.start()
++        self._start_service()
+         res = self.dbapi.get_conductor(self.hostname)
+         self.assertEqual(self.hostname, res['hostname'])
+         self.service.stop()
+@@ -80,24 +91,24 @@ class ManagerTestCase(base.DbTestCase):
+         with mock.patch.object(df._extension_manager, 'names') as mock_names:
+             # verify driver names are registered
+             mock_names.return_value = init_names
+-            self.service.start()
++            self._start_service()
+             res = self.dbapi.get_conductor(self.hostname)
+             self.assertEqual(init_names, res['drivers'])
+ 
+             # verify that restart registers new driver names
+             mock_names.return_value = restart_names
+-            self.service.start()
++            self._start_service()
+             res = self.dbapi.get_conductor(self.hostname)
+             self.assertEqual(restart_names, res['drivers'])
+ 
+     def test__conductor_service_record_keepalive(self):
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.dbapi, 'touch_conductor') as mock_touch:
+             self.service._conductor_service_record_keepalive(self.context)
+             mock_touch.assert_called_once_with(self.hostname)
+ 
+     def test__sync_power_state_no_sync(self):
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(driver='fake', power_state='fake-power')
+         self.dbapi.create_node(n)
+         with mock.patch.object(self.driver.power,
+@@ -109,7 +120,7 @@ class ManagerTestCase(base.DbTestCase):
+         self.assertEqual('fake-power', node['power_state'])
+ 
+     def test__sync_power_state_not_set(self):
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(driver='fake', power_state=None)
+         self.dbapi.create_node(n)
+         with mock.patch.object(self.driver.power,
+@@ -122,7 +133,7 @@ class ManagerTestCase(base.DbTestCase):
+ 
+     @mock.patch.object(objects.node.Node, 'save')
+     def test__sync_power_state_unchanged(self, save_mock):
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(driver='fake', power_state=states.POWER_ON)
+         self.dbapi.create_node(n)
+         with mock.patch.object(self.driver.power,
+@@ -135,7 +146,7 @@ class ManagerTestCase(base.DbTestCase):
+     @mock.patch.object(conductor_utils, 'node_power_action')
+     @mock.patch.object(objects.node.Node, 'save')
+     def test__sync_power_state_changed_sync(self, save_mock, npa_mock):
+-        self.service.start()
++        self._start_service()
+         self.config(force_power_state_during_sync=True, group='conductor')
+         n = utils.get_test_node(driver='fake', power_state=states.POWER_ON)
+         self.dbapi.create_node(n)
+@@ -154,7 +165,7 @@ class ManagerTestCase(base.DbTestCase):
+         """Force sync node power state and check if max retry
+             limit for force sync is honoured
+         """
+-        self.service.start()
++        self._start_service()
+         self.config(force_power_state_during_sync=True, group='conductor')
+         self.config(power_state_sync_max_retries=1, group='conductor')
+         n = utils.get_test_node(driver='fake', power_state=states.POWER_ON)
+@@ -180,7 +191,7 @@ class ManagerTestCase(base.DbTestCase):
+     @mock.patch.object(conductor_utils, 'node_power_action')
+     @mock.patch.object(objects.node.Node, 'save')
+     def test__sync_power_state_changed_failed(self, save_mock, npa_mock):
+-        self.service.start()
++        self._start_service()
+         self.config(force_power_state_during_sync=True, group='conductor')
+         n = utils.get_test_node(driver='fake', power_state=states.POWER_ON)
+         self.dbapi.create_node(n)
+@@ -199,7 +210,7 @@ class ManagerTestCase(base.DbTestCase):
+     @mock.patch.object(conductor_utils, 'node_power_action')
+     @mock.patch.object(objects.node.Node, 'save')
+     def test__sync_power_state_changed_save(self, save_mock, npa_mock):
+-        self.service.start()
++        self._start_service()
+         self.config(force_power_state_during_sync=False, group='conductor')
+         n = utils.get_test_node(driver='fake', power_state=states.POWER_OFF)
+         self.dbapi.create_node(n)
+@@ -212,7 +223,7 @@ class ManagerTestCase(base.DbTestCase):
+             self.assertTrue(save_mock.called)
+ 
+     def test__sync_power_state_node_locked(self):
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(driver='fake', power_state='fake-power')
+         self.dbapi.create_node(n)
+         self.dbapi.reserve_nodes('fake-reserve', [n['id']])
+@@ -224,7 +235,7 @@ class ManagerTestCase(base.DbTestCase):
+         self.assertEqual('fake-power', node['power_state'])
+ 
+     def test__sync_power_state_multiple_nodes(self):
+-        self.service.start()
++        self._start_service()
+         self.config(force_power_state_during_sync=False, group='conductor')
+ 
+         # create three nodes
+@@ -257,7 +268,7 @@ class ManagerTestCase(base.DbTestCase):
+         self.assertEqual(states.POWER_ON, n3['power_state'])
+ 
+     def test__sync_power_state_node_no_power_state(self):
+-        self.service.start()
++        self._start_service()
+         self.config(force_power_state_during_sync=False, group='conductor')
+ 
+         # create three nodes
+@@ -292,7 +303,7 @@ class ManagerTestCase(base.DbTestCase):
+             self.assertEqual(final[i], n.power_state)
+ 
+     def test__sync_power_state_node_deploywait(self):
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(provision_state=states.DEPLOYWAIT)
+         self.dbapi.create_node(n)
+ 
+@@ -307,7 +318,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake',
+                                 power_state=states.POWER_OFF)
+         db_node = self.dbapi.create_node(n)
+-        self.service.start()
++        self._start_service()
+ 
+         with mock.patch.object(self.driver.power, 'get_power_state') \
+                 as get_power_mock:
+@@ -338,7 +349,7 @@ class ManagerTestCase(base.DbTestCase):
+                                 power_state=pwr_state,
+                                 reservation=fake_reservation)
+         db_node = self.dbapi.create_node(n)
+-        self.service.start()
++        self._start_service()
+ 
+         exc = self.assertRaises(messaging.ClientException,
+                                 self.service.change_node_power_state,
+@@ -364,7 +375,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake',
+                                 power_state=initial_state)
+         db_node = self.dbapi.create_node(n)
+-        self.service.start()
++        self._start_service()
+ 
+         with mock.patch.object(self.service, '_spawn_worker') \
+                 as spawn_mock:
+@@ -395,7 +406,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake',
+                                 power_state=initial_state)
+         db_node = self.dbapi.create_node(n)
+-        self.service.start()
++        self._start_service()
+ 
+         with mock.patch.object(self.driver.power, 'get_power_state') \
+                 as get_power_mock:
+@@ -512,7 +523,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(n)
+         info = {'bar': 'baz'}
+-        self.service.start()
++        self._start_service()
+ 
+         self.service.vendor_passthru(
+             self.context, n['uuid'], 'first_method', info)
+@@ -529,7 +540,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake', reservation=fake_reservation)
+         node = self.dbapi.create_node(n)
+         info = {'bar': 'baz'}
+-        self.service.start()
++        self._start_service()
+ 
+         exc = self.assertRaises(messaging.ClientException,
+                                 self.service.vendor_passthru,
+@@ -546,7 +557,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(n)
+         info = {'bar': 'baz'}
+-        self.service.start()
++        self._start_service()
+ 
+         exc = self.assertRaises(messaging.ClientException,
+                                 self.service.vendor_passthru,
+@@ -565,7 +576,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(n)
+         info = {'invalid_param': 'whatever'}
+-        self.service.start()
++        self._start_service()
+ 
+         exc = self.assertRaises(messaging.ClientException,
+                                 self.service.vendor_passthru,
+@@ -583,7 +594,7 @@ class ManagerTestCase(base.DbTestCase):
+         node = self.dbapi.create_node(n)
+         info = {'bar': 'baz'}
+         self.driver.vendor = None
+-        self.service.start()
++        self._start_service()
+ 
+         exc = self.assertRaises(messaging.ClientException,
+                                 self.service.vendor_passthru,
+@@ -601,7 +612,7 @@ class ManagerTestCase(base.DbTestCase):
+         n = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(n)
+         info = {'bar': 'baz'}
+-        self.service.start()
++        self._start_service()
+ 
+         with mock.patch.object(self.service, '_spawn_worker') \
+                 as spawn_mock:
+@@ -701,7 +712,7 @@ class ManagerTestCase(base.DbTestCase):
+         mock_deploy.assert_called_once_with(mock.ANY, mock.ANY)
+ 
+     def test_do_node_deploy_partial_ok(self):
+-        self.service.start()
++        self._start_service()
+         thread = self.service._spawn_worker(lambda: None)
+         with mock.patch.object(self.service, '_spawn_worker') as mock_spawn:
+             mock_spawn.return_value = thread
+@@ -724,7 +735,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_do_node_deploy_worker_pool_full(self):
+         ndict = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+ 
+         with mock.patch.object(self.service, '_spawn_worker') as mock_spawn:
+             mock_spawn.side_effect = exception.NoFreeConductorWorker()
+@@ -773,7 +784,7 @@ class ManagerTestCase(base.DbTestCase):
+         node = self.dbapi.create_node(ndict)
+ 
+         task = task_manager.TaskManager(self.context, node.uuid)
+-        self.service.start()
++        self._start_service()
+         mock_tear_down.side_effect = exception.InstanceDeployFailure('test')
+         self.assertRaises(exception.InstanceDeployFailure,
+                           self.service._do_node_tear_down,
+@@ -792,7 +803,7 @@ class ManagerTestCase(base.DbTestCase):
+         node = self.dbapi.create_node(ndict)
+ 
+         task = task_manager.TaskManager(self.context, node.uuid)
+-        self.service.start()
++        self._start_service()
+         mock_tear_down.return_value = states.DELETED
+         self.service._do_node_tear_down(self.context, task)
+         node.refresh(self.context)
+@@ -808,7 +819,7 @@ class ManagerTestCase(base.DbTestCase):
+                                     provision_state=states.ACTIVE)
+         node = self.dbapi.create_node(ndict)
+ 
+-        self.service.start()
++        self._start_service()
+         task = task_manager.TaskManager(self.context, node.uuid)
+         mock_tear_down.return_value = states.DELETING
+         self.service._do_node_tear_down(self.context, task)
+@@ -822,7 +833,7 @@ class ManagerTestCase(base.DbTestCase):
+         ndict = utils.get_test_node(driver='fake',
+                                     provision_state=states.ACTIVE)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+ 
+         mock_spawn.side_effect = exception.NoFreeConductorWorker()
+ 
+@@ -904,7 +915,7 @@ class ManagerTestCase(base.DbTestCase):
+         func_mock = mock.Mock()
+         args = (1, 2, "test")
+         kwargs = dict(kw1='test1', kw2='test2')
+-        self.service.start()
++        self._start_service()
+ 
+         thread = self.service._spawn_worker(func_mock, *args, **kwargs)
+         self.service._worker_pool.waitall()
+@@ -919,7 +930,7 @@ class ManagerTestCase(base.DbTestCase):
+         def func():
+             time.sleep(1)
+         link_callback = mock.Mock()
+-        self.service.start()
++        self._start_service()
+ 
+         thread = self.service._spawn_worker(func)
+         # func_mock executing at this moment
+@@ -932,7 +943,7 @@ class ManagerTestCase(base.DbTestCase):
+         def func():
+             pass
+         link_callback = mock.Mock()
+-        self.service.start()
++        self._start_service()
+ 
+         thread = self.service._spawn_worker(func)
+         self.service._worker_pool.waitall()
+@@ -946,7 +957,7 @@ class ManagerTestCase(base.DbTestCase):
+             time.sleep(1)
+             raise Exception()
+         link_callback = mock.Mock()
+-        self.service.start()
++        self._start_service()
+ 
+         thread = self.service._spawn_worker(func)
+         # func_mock executing at this moment
+@@ -959,7 +970,7 @@ class ManagerTestCase(base.DbTestCase):
+         def func():
+             raise Exception()
+         link_callback = mock.Mock()
+-        self.service.start()
++        self._start_service()
+ 
+         thread = self.service._spawn_worker(func)
+         self.service._worker_pool.waitall()
+@@ -969,7 +980,7 @@ class ManagerTestCase(base.DbTestCase):
+         link_callback.assert_called_once_with(thread)
+ 
+     def test_destroy_node(self):
+-        self.service.start()
++        self._start_service()
+         ndict = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(ndict)
+         self.service.destroy_node(self.context, node.uuid)
+@@ -978,7 +989,7 @@ class ManagerTestCase(base.DbTestCase):
+                           node.uuid)
+ 
+     def test_destroy_node_reserved(self):
+-        self.service.start()
++        self._start_service()
+         fake_reservation = 'fake-reserv'
+         ndict = utils.get_test_node(reservation=fake_reservation)
+         node = self.dbapi.create_node(ndict)
+@@ -993,7 +1004,7 @@ class ManagerTestCase(base.DbTestCase):
+         self.assertEqual(fake_reservation, node.reservation)
+ 
+     def test_destroy_node_associated(self):
+-        self.service.start()
++        self._start_service()
+         ndict = utils.get_test_node(instance_uuid='fake-uuid')
+         node = self.dbapi.create_node(ndict)
+ 
+@@ -1013,7 +1024,7 @@ class ManagerTestCase(base.DbTestCase):
+         past = datetime.datetime(2000, 1, 1, 0, 0)
+         present = past + datetime.timedelta(minutes=5)
+         mock_utcnow.return_value = past
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(provision_state=states.DEPLOYWAIT,
+                                 target_provision_state=states.DEPLOYDONE,
+                                 provision_updated_at=past)
+@@ -1034,7 +1045,7 @@ class ManagerTestCase(base.DbTestCase):
+         past = datetime.datetime(2000, 1, 1, 0, 0)
+         present = past + datetime.timedelta(minutes=5)
+         mock_utcnow.return_value = past
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(provision_state=states.DEPLOYWAIT,
+                                 target_provision_state=states.DEPLOYDONE,
+                                 provision_updated_at=past)
+@@ -1050,7 +1061,7 @@ class ManagerTestCase(base.DbTestCase):
+ 
+     def test__check_deploy_timeouts_disabled(self):
+         self.config(deploy_callback_timeout=0, group='conductor')
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.dbapi, 'get_nodeinfo_list') as get_mock:
+             self.service._check_deploy_timeouts(self.context)
+             self.assertFalse(get_mock.called)
+@@ -1061,7 +1072,7 @@ class ManagerTestCase(base.DbTestCase):
+         past = datetime.datetime(2000, 1, 1, 0, 0)
+         present = past + datetime.timedelta(minutes=5)
+         mock_utcnow.return_value = past
+-        self.service.start()
++        self._start_service()
+         n = utils.get_test_node(provision_state=states.DEPLOYWAIT,
+                                 target_provision_state=states.DEPLOYDONE,
+                                 provision_updated_at=past)
+@@ -1081,7 +1092,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_set_console_mode_worker_pool_full(self):
+         ndict = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.service, '_spawn_worker') \
+                 as spawn_mock:
+             spawn_mock.side_effect = exception.NoFreeConductorWorker()
+@@ -1097,7 +1108,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_set_console_mode_enabled(self):
+         ndict = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         self.service.set_console_mode(self.context, node.uuid, True)
+         self.service._worker_pool.waitall()
+         node.refresh(self.context)
+@@ -1106,7 +1117,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_set_console_mode_disabled(self):
+         ndict = utils.get_test_node(driver='fake')
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         self.service.set_console_mode(self.context, node.uuid, False)
+         self.service._worker_pool.waitall()
+         node.refresh(self.context)
+@@ -1115,7 +1126,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_set_console_mode_not_supported(self):
+         ndict = utils.get_test_node(driver='fake', last_error=None)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         # null the console interface
+         self.driver.console = None
+         exc = self.assertRaises(messaging.ClientException,
+@@ -1131,7 +1142,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_set_console_mode_validation_fail(self):
+         ndict = utils.get_test_node(driver='fake', last_error=None)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.driver.console, 'validate') as mock_val:
+             mock_val.side_effect = exception.InvalidParameterValue('error')
+             exc = self.assertRaises(messaging.ClientException,
+@@ -1144,7 +1155,7 @@ class ManagerTestCase(base.DbTestCase):
+         ndict = utils.get_test_node(driver='fake', last_error=None,
+                                     console_enabled=False)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.driver.console, 'start_console') \
+                 as mock_sc:
+             mock_sc.side_effect = exception.IronicException('test-error')
+@@ -1158,7 +1169,7 @@ class ManagerTestCase(base.DbTestCase):
+         ndict = utils.get_test_node(driver='fake', last_error=None,
+                                     console_enabled=True)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.driver.console, 'stop_console') \
+                 as mock_sc:
+             mock_sc.side_effect = exception.IronicException('test-error')
+@@ -1171,7 +1182,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_enable_console_already_enabled(self):
+         ndict = utils.get_test_node(driver='fake', console_enabled=True)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.driver.console, 'start_console') \
+                 as mock_sc:
+             self.service.set_console_mode(self.context, node.uuid, True)
+@@ -1181,7 +1192,7 @@ class ManagerTestCase(base.DbTestCase):
+     def test_disable_console_already_disabled(self):
+         ndict = utils.get_test_node(driver='fake', console_enabled=False)
+         node = self.dbapi.create_node(ndict)
+-        self.service.start()
++        self._start_service()
+         with mock.patch.object(self.driver.console, 'stop_console') \
+                 as mock_sc:
+             self.service.set_console_mode(self.context, node.uuid, False)
+@@ -1231,7 +1242,7 @@ class ManagerTestCase(base.DbTestCase):
+             self.assertEqual(exc._exc_info[0], exception.InvalidParameterValue)
+ 
+     def test_destroy_node_power_on(self):
+-        self.service.start()
++        self._start_service()
+         ndict = utils.get_test_node(power_state=states.POWER_ON)
+         node = self.dbapi.create_node(ndict)
+ 
+@@ -1245,7 +1256,7 @@ class ManagerTestCase(base.DbTestCase):
+         self.assertIsNone(node.reservation)
+ 
+     def test_destroy_node_power_off(self):
+-        self.service.start()
++        self._start_service()
+         ndict = utils.get_test_node(power_state=states.POWER_OFF)
+         node = self.dbapi.create_node(ndict)
+         self.service.destroy_node(self.context, node.uuid)
+-- 
+1.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-01 22:53:05 +0000
+++ debian/patches/series	2014-04-15 23:19:36 +0000
@@ -1,1 +1,2 @@
 set_logdir.patch
+cleanup_conductors_in_tests.patch