Merge lp://staging/~lazypower/charms/trusty/elasticsearch/amulet-test-bump into lp://staging/charms/trusty/elasticsearch
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~lazypower/charms/trusty/elasticsearch/amulet-test-bump |
| Merge into: | lp://staging/charms/trusty/elasticsearch |
| Diff against target: |
1889 lines (+1618/-139) 22 files modified
hooks/client-relation-departed (+100/-0) hooks/client-relation-joined (+100/-0) hooks/config-changed (+100/-0) hooks/data-relation-changed (+100/-0) hooks/data-relation-departed (+100/-0) hooks/data-relation-joined (+100/-0) hooks/hooks.py (+4/-3) hooks/install (+100/-0) hooks/logs-relation-joined (+100/-0) hooks/nrpe-external-master-relation-changed (+100/-0) hooks/peer-relation-changed (+100/-0) hooks/peer-relation-departed (+100/-0) hooks/peer-relation-joined (+100/-0) hooks/start (+100/-0) hooks/stop (+100/-0) hooks/upgrade-charm (+100/-0) tests/00-create-index (+0/-32) tests/00-single-to-scale-test.py (+112/-0) tests/01-config-changes (+0/-22) tests/02-deploy-three-units (+0/-18) tests/helpers/__init__.py (+0/-64) tests/tests.yaml (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~lazypower/charms/trusty/elasticsearch/amulet-test-bump |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Glass (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Refactors the tests into a single amulet class
Slight refactoring of the test helper modules inline
elasticsearch
charm-proof PASS
make lint PASS
make test PASS
00-
Bundletester seems to like this branch, it passes cleanly on AWS and OpenStack. I have not tested if this has changed the results on GCE failures.
This branch also properly marks hooks as chmod +x instead of relying on Juju to do this for us.
Unmerged revisions
- 43. By Charles Butler
-
- Merged tests into a single amulet TestClass
- Refactored the tests due to consistent failures when testing on GCE
- minor lint cleanups
Looks good, +1
Note: the +x changes on symlinks are a little weird, but harmless.