openstack/trove
Code Issues Proposed changes

Merge "fixing taskmanager exception after migration is complete"

Browse Source
This commit is contained in:
Jenkins 2013-05-06 20:59:32 +00:00 committed by Gerrit Code Review
commit 1228d99075
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reddwarf/taskmanager/models.py
View File

@ -578,7 +578,7 @@ class MigrateAction(ResizeActionBase):
def _record_action_success(self):
LOG.debug("Successfully finished Migration to %s: %s" %
(self.hostname, self.instance.id))
(self.instance.hostname, self.instance.id))
def _start_mysql(self):
self.instance.guest.restart()

9
reddwarf/tests/api/instances_resize.py
View File

@ -199,7 +199,14 @@ class MigrateTests(ResizeTestBase):
def tearDown(self):
super(MigrateTests, self).tearDown()
self._teardown()
try:
self.instance.update_db(task_status=InstanceTasks.NONE)
self.mock.ReplayAll()
self.assertEqual(None, self.action.execute())
self.mock.VerifyAll()
finally:
self.mock.UnsetStubs()
self.db_info.delete()
def _start_mysql(self):
self.guest.restart()