Merge lp://staging/~abentley/juju-ci-tools/industrial-jes-2 into lp://staging/juju-ci-tools
Proposed by
Aaron Bentley
| Status: | Merged |
|---|---|
| Merged at revision: | 1221 |
| Proposed branch: | lp://staging/~abentley/juju-ci-tools/industrial-jes-2 |
| Merge into: | lp://staging/juju-ci-tools |
| Prerequisite: | lp://staging/~abentley/juju-ci-tools/industrial-agent-stream |
| Diff against target: |
154 lines (+56/-13) 3 files modified
industrial_test.py (+5/-2) tests/test_industrial_test.py (+40/-9) tests/test_jujupy.py (+11/-2) |
| To merge this branch: | bzr merge lp://staging/~abentley/juju-ci-tools/industrial-jes-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Support JES in industrial_tests.
Description of the change
Support JES in industrial tests.
It turns out that even though destroy-environment is a valid command in JES-enabled Jujus, it can't be used to tear down a bootstrapped environment.
This branch changes industrial_test to do kill_controller() if the client is JES-enabled.
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.