Juju Charms Collection
hacluster package

Merge lp://qastaging/~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12 into lp://qastaging/~openstack-charmers/charms/trusty/hacluster/next

Proposed by Ryan Beisner on 2015-12-16

Status:	Merged
Merged at revision:	60
Proposed branch:	lp://qastaging/~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12
Merge into:	lp://qastaging/~openstack-charmers/charms/trusty/hacluster/next
Diff against target:	1420 lines (+918/-110) 6 files modified Makefile (+1/-0) tests/basic_deployment.py (+33/-12) tests/charmhelpers/contrib/amulet/deployment.py (+4/-2) tests/charmhelpers/contrib/amulet/utils.py (+368/-83) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+131/-13) tests/charmhelpers/contrib/openstack/amulet/utils.py (+381/-0)
To merge this branch:	bzr merge lp://qastaging/~1chb1n/charms/trusty/hacluster/next-amulet-update-15.12
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
David Ames (community)		2015-12-16	Approve on 2015-12-17
Review via email: mp+280731@code.qastaging.launchpad.net

Commit message

Amulet tests: Add debug logging, wait for unit readiness, prevent extra bootstrap cycle, sync tests/charmhelpers, clean up old lint which was masked by noqa, resolve unit index issue with newer versions of Juju.

Description of the change

Amulet tests:
- Add debug logging for improved test feedback
- Wait for unit readiness before testing
- Prevent extra bootstrap cycle from 00-setup
- Sync tests/charmhelpers
- Clean up old lint which was masked by noqa
- Resolve unit index issue with newer versions of Juju.

Example of successful test output with these changes:
http://paste.ubuntu.com/14051186/

ref: https://github.com/juju/amulet/issues/111