openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Make wait_for_server_os_boot wait longer"

This commit is contained in:
Jenkins 2016-08-18 13:01:51 +00:00 committed by Gerrit Code Review
parent 95ad95e280 56ee584034
commit 38073cab51
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
novaclient/tests/functional/base.py
View File

@ -274,7 +274,7 @@ class ClientTestBase(testtools.TestCase):
self.fail("Volume %s did not reach status %s after %d s"
% (volume.id, status, timeout))
def wait_for_server_os_boot(self, server_id, timeout=60,
def wait_for_server_os_boot(self, server_id, timeout=300,
poll_interval=1):
"""Wait until instance's operating system is completely booted.
@ -283,13 +283,15 @@ class ClientTestBase(testtools.TestCase):
:param poll_interval: poll interval in seconds
"""
start_time = time.time()
console = None
while time.time() - start_time < timeout:
if BOOT_IS_COMPLETE in self.nova('console-log %s ' % server_id):
console = self.nova('console-log %s ' % server_id)
if BOOT_IS_COMPLETE in console:
break
time.sleep(poll_interval)
else:
self.fail("Server %s did not boot after %d s"
% (server_id, timeout))
self.fail("Server %s did not boot after %d s.\nConsole:\n%s"
% (server_id, timeout, console))
def wait_for_resource_delete(self, resource, manager,
timeout=60, poll_interval=1):