wait for status instead of sleep

lborda · Jan 13, 2016 · cb79f3b · cb79f3b
1 parent 06b5b7d
commit cb79f3b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
@@ -6,7 +6,6 @@
 
 import amulet
 import os
-import time
 import yaml
 
 from charmhelpers.contrib.openstack.amulet.deployment import (
@@ -36,6 +35,11 @@ def __init__(self, series=None, openstack=None,
         self._add_relations()
         self._configure_services()
         self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _assert_services(self, should_run):
@@ -113,9 +117,6 @@ def _initialize_tests(self):
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Let things settle a bit before moving forward
-        time.sleep(30)
-
         # Authenticate keystone admin
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',