Merge lp://staging/~johnsca/charms/trusty/haproxy/xenial-support into lp://staging/~jamesj/charms/trusty/haproxy/xenial-support
Proposed by
Cory Johns
| Status: | Merged |
|---|---|
| Approved by: | James Jesudason |
| Approved revision: | 105 |
| Merged at revision: | 106 |
| Proposed branch: | lp://staging/~johnsca/charms/trusty/haproxy/xenial-support |
| Merge into: | lp://staging/~jamesj/charms/trusty/haproxy/xenial-support |
| Diff against target: |
603 lines (+372/-184) 6 files modified
hooks/hooks.py (+2/-1) hooks/tests/test_install.py (+3/-1) metadata.yaml (+3/-0) tests/10_deploy_test.py (+0/-182) tests/11_deploy_test_trusty.py (+182/-0) tests/12_deploy_test_xenial.py (+182/-0) |
| To merge this branch: | bzr merge lp://staging/~johnsca/charms/trusty/haproxy/xenial-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Jesudason | Approve | ||
|
Review via email:
|
|||
Description of the change
I added a deploy test for Xenial, and while running tests with that, hit a failure in the unit tests and an import error in the Xenial test, so I added fixes for both of those. I tried to add support for precise, but got a hook error so I removed it: http://
I also added the supported series to the metadata per the new convention.
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
Thanks, that looks good.
I can't run tests locally at the moment as I'm on Juju 2.0. The two tests look as though they are very similar and could be refactored to call a function to remove the code duplication. I'll approve and merge for now and we can look at refactoring later.