openstack
/
charm-glance
Code Issues Proposed changes

[1chb1n, r=thedac] wait for unit status and turn on releases for amulet tests

This commit is contained in:
David Ames 2016-01-21 11:48:46 -08:00
parent 7c70c479a9 c46da67877
commit 6ed794bef9
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/018-basic-trusty-liberty Normal file → Executable file
View File

0
tests/019-basic-trusty-mitaka Normal file → Executable file
View File

0
tests/020-basic-wily-liberty Normal file → Executable file
View File

9
tests/basic_deployment.py
View File

@ -6,7 +6,6 @@ Basic glance amulet functional tests.
import amulet
import os
import time
import yaml
from charmhelpers.contrib.openstack.amulet.deployment import (
@ -40,6 +39,11 @@ class GlanceBasicDeployment(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 _assert_services(self, should_run):
@ -119,9 +123,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
u.log.debug('openstack release str: {}'.format(
self._get_openstack_release_string()))
# 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',