diff options
| -rw-r--r-- | novaclient/tests/functional/base.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py index 08b6b0da..494d8aab 100644 --- a/novaclient/tests/functional/base.py +++ b/novaclient/tests/functional/base.py @@ -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): |