Merge lp://staging/~abentley/juju-ci-tools/fix-iter-errors into lp://staging/juju-ci-tools
Proposed by
Aaron Bentley
| Status: | Merged |
|---|---|
| Merged at revision: | 1868 |
| Proposed branch: | lp://staging/~abentley/juju-ci-tools/fix-iter-errors |
| Merge into: | lp://staging/juju-ci-tools |
| Diff against target: |
230 lines (+122/-12) 4 files modified
jujupy/client.py (+18/-2) jujupy/tests/test_client.py (+57/-8) jujupy/tests/test_version_client.py (+44/-0) jujupy/version_client.py (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~abentley/juju-ci-tools/fix-iter-errors |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Iterate through containers and subordinate units.
Description of the change
This branch fixes handling of containers and subordinate units.
Their failure statuses were being ignored. This branch corrects this by switching to iter_machines(
Also added __eq__ and __ne__ for easier testing.
The behaviour should be unchanged when there are no containers or subordinates.
Fixed some tests where status lacked a 'machines' key. I believe they are invalid.
Also fixed some lint as a driveby.
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
Thank you!