Merge lp:~1chb1n/charms/trusty/cinder-ceph/next-amulet-1602 into lp:~openstack-charmers-archive/charms/trusty/cinder-ceph/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 54
Proposed branch: lp:~1chb1n/charms/trusty/cinder-ceph/next-amulet-1602
Merge into: lp:~openstack-charmers-archive/charms/trusty/cinder-ceph/next
Diff against target: 31 lines (+7/-3)
1 file modified
tests/basic_deployment.py (+7/-3)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/cinder-ceph/next-amulet-1602
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+285944@code.launchpad.net

Description of the change

Update amulet test definitions; Wait for workload status before testing.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #390 cinder-ceph-next for 1chb1n mp285944
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/390/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #311 cinder-ceph-next for 1chb1n mp285944
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/311/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #161 cinder-ceph-next for 1chb1n mp285944
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/161/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
2=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
3=== modified file 'tests/020-basic-wily-liberty' (properties changed: -x to +x)
4=== modified file 'tests/021-basic-xenial-mitaka' (properties changed: -x to +x)
5=== modified file 'tests/basic_deployment.py'
6--- tests/basic_deployment.py 2015-11-03 14:16:36 +0000
7+++ tests/basic_deployment.py 2016-02-12 21:50:16 +0000
8@@ -33,6 +33,13 @@
9 self._add_relations()
10 self._configure_services()
11 self._deploy()
12+
13+ u.log.info('Waiting on extended status checks...')
14+ exclude_services = ['mysql', 'nrpe']
15+
16+ # Wait for deployment ready msgs, except exclusions
17+ self._auto_wait_for_status(exclude_services=exclude_services)
18+
19 self._initialize_tests()
20
21 def _add_services(self):
22@@ -119,9 +126,6 @@
23 u.log.debug('openstack release str: {}'.format(
24 self._get_openstack_release_string()))
25
26- # Let things settle a bit original moving forward
27- time.sleep(30)
28-
29 # Authenticate admin with keystone
30 self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
31 user='admin',

Subscribers

People subscribed via source and target branches