From 78b562f2abddff64a7259b9fa4180a3df11a1a1b Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Mon, 8 Aug 2016 20:36:07 +0300 Subject: [PATCH] restore configuring bundled image in s3 Change-Id: I8018fc5a467e5be83b6d2cbd58b6c9d8744a9421 --- api/test_images.py | 4 +--- scenario/test_instances.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/api/test_images.py b/api/test_images.py index 45c05c6..5508b0a 100644 --- a/api/test_images.py +++ b/api/test_images.py @@ -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) diff --git a/scenario/test_instances.py b/scenario/test_instances.py index be69a29..7ca30ca 100644 --- a/scenario/test_instances.py +++ b/scenario/test_instances.py @@ -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():