test_rebuild_server tolerant of imageRef as URI

Make TestserverActions.test_build_server tolerant of imageRef configured
as a glance URI, by asserting on endswith as opposed to doing an equality
comparison with the image UUID.

Change-Id: I99f82dbfce8ae506596e123dda43729e500bf0e0
This commit is contained in:
Eoghan Glynn 2012-03-01 16:50:29 -05:00
parent 2148b62395
commit 57c1a3d326

View File

@ -75,13 +75,15 @@ class ServerActionsTest(unittest.TestCase):
#Verify the properties in the initial response are correct
self.assertEqual(self.server_id, rebuilt_server['id'])
self.assertEqual(self.image_ref_alt, rebuilt_server['image']['id'])
rebuilt_image_id = rebuilt_server['image']['id']
self.assertTrue(self.image_ref_alt.endswith(rebuilt_image_id))
self.assertEqual(self.flavor_ref, rebuilt_server['flavor']['id'])
#Verify the server properties after the rebuild completes
self.client.wait_for_server_status(rebuilt_server['id'], 'ACTIVE')
resp, server = self.client.get_server(rebuilt_server['id'])
self.assertEqual(self.image_ref_alt, rebuilt_server['image']['id'])
rebuilt_image_id = rebuilt_server['image']['id']
self.assertTrue(self.image_ref_alt.endswith(rebuilt_image_id))
self.assertEqual(new_name, rebuilt_server['name'])
@attr(type='smoke')