Merge lp://qastaging/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Ryan Beisner
Status: | Merged |
---|---|
Merged at revision: | 175 |
Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
335 lines (+118/-65) 5 files modified
Makefile (+1/-1) tests/00-setup (+3/-1) tests/basic_deployment.py (+11/-9) tests/charmhelpers/contrib/amulet/utils.py (+101/-53) tests/tests.yaml (+2/-1) |
To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Billy Olsen | Pending | ||
OpenStack Charmers | Pending | ||
Review via email: mp+269501@code.qastaging.launchpad.net |
Description of the change
* amulet test update - switch svc restart check to validate_
* update makefile for unit test verbose
* update amulet test dependencies
* sync tests/charmhelpers for svc restart check race fix
This MP is dependent on charm-helpers changes landing first:
https:/
To post a comment you must log in.
charm_lint_check #8930 keystone-next for 1chb1n mp269501
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/8930/