Merge lp://staging/~dpb/charm-tools/allow-juju-home into lp://staging/charm-tools/1.2
Proposed by
David Britton
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 325 | ||||
| Proposed branch: | lp://staging/~dpb/charm-tools/allow-juju-home | ||||
| Merge into: | lp://staging/charm-tools/1.2 | ||||
| Diff against target: |
187 lines (+25/-21) 2 files modified
charmtools/test.py (+11/-9) tests/test_juju_test.py (+14/-12) |
||||
| To merge this branch: | bzr merge lp://staging/~dpb/charm-tools/allow-juju-home | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Pass environment to all commands juju-test calls.
- Clean up a couple None defaults to juju_env in the bootstrap codepath (unested, and broken)
- Since self.env is already whitelisted and modifiable by the admin, just pass `env=self.env` around to commands.
- The juju version command is too isolated, so I chose to pass on that one.
- Modify tests to expect new call pattern.
- change encoding of file to utf-8, since there are Unicode characters embedded in it.
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
LGTM, +1!