kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 18:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for termination string in ec2 tests

Browse source 
Pretty much copy&paste from vbox
This commit is contained in:
Anders Ingemann 2015-04-10 14:40:47 +02:00 • committed by Anders Ingemann
parent bfe58dd4a8
commit a4bd52bf9e
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/integration/providers/ec2/__init__.py
View file

@ -48,14 +48,14 @@ def boot_image(manifest, build_server, bootstrap_info, instance_type=None):
image = S3Image(bootstrap_info._ec2['image'], ec2_connection)
try:
with run_instance(image, instance_type, ec2_connection, vpc_connection) as instance:
with run_instance(image, manifest, instance_type, ec2_connection, vpc_connection) as instance:
yield instance
finally:
image.destroy()
@contextmanager
def run_instance(image, instance_type, ec2_connection, vpc_connection):
def run_instance(image, manifest, instance_type, ec2_connection, vpc_connection):
with create_env(ec2_connection, vpc_connection) as boot_env:
@ -79,6 +79,19 @@ def run_instance(image, instance_type, ec2_connection, vpc_connection):
if not waituntil(lambda: instance.get_console_output().output is not None, timeout=600, interval=3):
raise EC2InstanceStartupException('Timeout while fetching console output')
from bootstrapvz.common.tools import get_codename
if get_codename(manifest.system['release']) in ['squeeze', 'wheezy']:
termination_string = 'INIT: Entering runlevel: 2'
else:
termination_string = 'Debian GNU/Linux'
console_output = instance.get_console_output().output
if termination_string not in console_output:
last_lines = '\n'.join(console_output.split('\n')[-50:])
message = ('The instance did not boot properly.\n'
'Last 50 lines of console output:\n{output}'.format(output=last_lines))
raise EC2InstanceStartupException(message)
yield instance
finally:
if instance is not None: