Merge lp://staging/~dpb/charms/precise/landscape-client/add-landscape-relation into lp://staging/~charmers/charms/precise/landscape-client/trunk
Proposed by
David Britton
| Status: | Merged |
|---|---|
| Merged at revision: | 22 |
| Proposed branch: | lp://staging/~dpb/charms/precise/landscape-client/add-landscape-relation |
| Merge into: | lp://staging/~charmers/charms/precise/landscape-client/trunk |
| Diff against target: |
472 lines (+314/-20) 13 files modified
README (+4/-9) TESTING (+5/-0) config.yaml (+1/-0) hooks/common.py (+14/-2) hooks/hooks.py (+45/-8) hooks/install (+11/-0) metadata.yaml (+2/-0) revision (+1/-1) tests/001_install.test (+95/-0) tests/Makefile (+8/-0) tests/lib/test-config.yaml (+8/-0) tests/lib/test-helpers.sh (+114/-0) tests/test.sh (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~dpb/charms/precise/landscape-client/add-landscape-relation |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
- Main change: allow association to a landscape-server via relation. This is mostly useful for testing, but could be useful in the future for rapid deployment into an environment that already has a landscape server (which there is no public charm for yet)
- Update README with a couple changes I noticed during testing.
- Add 'tests/' jitsu-test-style test case. Still need to work with m_3 to figure out a couple oddities with it, but it does work for me at least
- centralize hooks into a hooks.py with symlinks
- Add ability to install from a branch (lp: syntax)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi David, sorry it took so long to get around to this. So I'll be brief with the review. This LGTM! Thank you for supplying tests. I've got some more information for you below.
So, we're going to be dropping jitsu very soon as a lot of it isn't compatible with juju-core. I'm working on a real set of testing-helpers ("testing harness") that will replace jitsu-watch and test-helpers.sh with a more robust bash/python library. Keep an eye on the list for more information on that next week. I don't see it necessary to change what you have here but just be aware in the next few months as we move our automated testing environment from just pyjuju to both pyjuju + juju-core and eventually just juju-core that these tests will need to be amended.