From 16f32b3cc690205442e7a4f805ae26dee34b39bd Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Fri, 12 Feb 2016 21:43:28 +0000 Subject: [PATCH] Update amulet test definitions; Wait for workload status before testing. --- tests/018-basic-trusty-liberty | 0 tests/019-basic-trusty-mitaka | 0 tests/020-basic-wily-liberty | 0 tests/basic_deployment.py | 11 +++++++---- 4 files changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 tests/018-basic-trusty-liberty mode change 100644 => 100755 tests/019-basic-trusty-mitaka mode change 100644 => 100755 tests/020-basic-wily-liberty diff --git a/tests/018-basic-trusty-liberty b/tests/018-basic-trusty-liberty old mode 100644 new mode 100755 diff --git a/tests/019-basic-trusty-mitaka b/tests/019-basic-trusty-mitaka old mode 100644 new mode 100755 diff --git a/tests/020-basic-wily-liberty b/tests/020-basic-wily-liberty old mode 100644 new mode 100755 diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 95fa404f..b879a608 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -1,7 +1,6 @@ #!/usr/bin/python import amulet -import time from charmhelpers.contrib.openstack.amulet.deployment import ( OpenStackAmuletDeployment ) @@ -26,6 +25,13 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment): self._add_relations() self._configure_services() self._deploy() + + u.log.info('Waiting on extended status checks...') + exclude_services = ['mysql'] + + # Wait for deployment ready msgs, except exclusions + self._auto_wait_for_status(exclude_services=exclude_services) + self._initialize_tests() def _add_services(self): @@ -108,9 +114,6 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment): u.log.debug('openstack release str: {}'.format( self._get_openstack_release_string())) - # Let things settle a bit original moving forward - time.sleep(30) - # Authenticate admin with keystone self.keystone = u.authenticate_keystone_admin(self.keystone_sentry, user='admin',