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

Fix boot detection and extend boot timeout

Browse source
This commit is contained in:
Anders Ingemann 2015-01-19 16:37:31 +01:00
parent 0f82fbd6af
commit 0e19b4c1ed
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/integration/instances/virtualbox.py
View file

@ -60,11 +60,12 @@ class VirtualBoxInstance(Instance):
# Gotta figure out a more reliable way to check when the system is done booting. # Gotta figure out a more reliable way to check when the system is done booting.
# Maybe bootstrapped unit test images should have a startup script that issues # Maybe bootstrapped unit test images should have a startup script that issues
# a callback to the host. # a callback to the host.
if self.image.manifest.system['release'] in ['squeeze', 'wheezy']: from bootstrapvz.common.tools import get_codename
if get_codename(self.image.manifest.system['release']) in ['squeeze', 'wheezy']:
termination_string = 'INIT: Entering runlevel: 2' termination_string = 'INIT: Entering runlevel: 2'
else: else:
termination_string = 'Debian GNU/Linux' termination_string = 'Debian GNU/Linux'
self.console_output = read_from_socket(self.serial_port_path, termination_string, 20) self.console_output = read_from_socket(self.serial_port_path, termination_string, 120)
def shutdown(self): def shutdown(self):
log.debug('Shutting down vbox machine `{name}\''.format(name=self.name)) log.debug('Shutting down vbox machine `{name}\''.format(name=self.name))