From a3247756e59ca4804c7c0163e06835e3d95ecd1e Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Fri, 22 Jan 2016 04:29:30 +0000 Subject: [PATCH] really wait for unit status instead of sleeping before amulet tests --- tests/basic_deployment.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index db5b000f..9aafdad7 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -1,6 +1,5 @@ import amulet import os -import time import yaml from neutronclient.v2_0 import client as neutronclient @@ -32,6 +31,11 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): 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 _add_services(self): @@ -154,9 +158,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment): self.neutron_gateway_sentry = self.d.sentry.unit['neutron-gateway/0'] self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0'] - # Let things settle a bit before moving forward - time.sleep(30) - # Authenticate admin with keystone self.keystone = u.authenticate_keystone_admin(self.keystone_sentry, user='admin',