x/cloudroast
Code Issues Proposed changes

Merge "Fixes corner case test_distro_after_rebuild"

Browse Source
This commit is contained in:
Jenkins 2014-11-24 18:26:14 +00:00 committed by Gerrit Code Review
commit d13037dc81
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudroast/compute/instance_actions/api/test_rebuild_server.py
View File

@ -254,7 +254,9 @@ class RebuildServerTests(object):
self.server, self.servers_config, password=self.password,
key=self.key.private_key)
distro_after_rebuild = remote_client.get_distribution_and_version()
if self.image_ref != self.image_ref_alt:
if (self.distro_before_rebuild and
distro_after_rebuild and
self.image_ref != self.image_ref_alt):
self.assertNotEqual(self.distro_before_rebuild, distro_after_rebuild)
else:
self.assertEqual(self.distro_before_rebuild, distro_after_rebuild)