Add unit tests for nova_helper.py

The nova helper does not have a sufficient code coverage.
This commit raises its coverage from 39% to 89%.
And unit tests find two bugs.

Closes-Bug: #1607198
Change-Id: Iebb693cd09e512ce44702eddca8ead0c7310b263
Closes-Bug: #1599849
This commit is contained in:
licanwei
2016-07-16 12:11:26 +08:00
parent 27b3c5254d
commit 6144551809
2 changed files with 144 additions and 29 deletions

View File

@@ -72,6 +72,7 @@ class NovaHelper(object):
else:
raise Exception("Volume %s did not reach status %s after %d s"
% (volume.id, status, timeout))
return volume.status == status
def watcher_non_live_migrate_instance(self, instance_id, node_id,
keep_original_image_name=True):
@@ -426,6 +427,8 @@ class NovaHelper(object):
metadata)
image = self.glance.images.get(image_uuid)
if not image:
return None
# Waiting for the new image to be officially in ACTIVE state
# in order to make sure it can be used
@@ -436,6 +439,8 @@ class NovaHelper(object):
retry -= 1
# Retrieve the instance again so the status field updates
image = self.glance.images.get(image_uuid)
if not image:
break
status = image.status
LOG.debug("Current image status: %s" % status)