restore configuring bundled image in s3

Change-Id: I8018fc5a467e5be83b6d2cbd58b6c9d8744a9421
This commit is contained in:
Andrey Pavlov 2016-08-08 20:36:07 +03:00
parent 452fb9de5c
commit 78b562f2ab
2 changed files with 15 additions and 3 deletions

View File

@ -335,7 +335,5 @@ class ImageRegisterTest(base.EC2TestCase):
self.get_image_waiter().wait_available(image_id)
self.client.deregister_image(ImageId=image_id)
self.assertRaises('InvalidAMIID.NotFound',
self.client.describe_images,
ImageIds=[image_id])
self.cancelResourceCleanUp(image_clean)
self.get_image_waiter().wait_delete(image_id)

View File

@ -152,6 +152,20 @@ class InstancesTest(scenario_base.BaseScenarioTest):
instance_id = self.run_instance(ImageId=image_id,
SecurityGroups=[sec_group_name])
waiter = base.EC2Waiter(self.client.get_console_output)
waiter.wait_no_exception(InstanceId=instance_id)
def _compare_console_output():
data = self.client.get_console_output(InstanceId=instance_id)
self.assertEqual(instance_id, data['InstanceId'])
self.assertIsNotNone(data['Timestamp'])
self.assertIn('Output', data)
self.assertNotEqual('', data['Output'])
waiter = base.EC2Waiter(_compare_console_output)
waiter.wait_no_exception()
# check ping
ip_address = self.get_instance_ip(instance_id)
def _ping():