juju-ci-tools

Merge lp://staging/~abentley/juju-ci-tools/remove-machine-2 into lp://staging/juju-ci-tools

  1. remove-machine-2
  2. Merge into trunk
Proposed by Aaron Bentley
Status: Merged
Merged at revision: 1921
Proposed branch: lp://staging/~abentley/juju-ci-tools/remove-machine-2
Merge into: lp://staging/juju-ci-tools
Diff against target: 240 lines (+96/-17)
7 files modified
assess_cloud.py (+3/-4)
assess_heterogeneous_control.py (+2/-2)
industrial_test.py (+1/-1)
jujupy/client.py (+28/-1)
jujupy/fake.py (+3/-0)
jujupy/tests/test_client.py (+58/-0)
tests/test_assess_cloud.py (+1/-9)
To merge this branch: bzr merge lp://staging/~abentley/juju-ci-tools/remove-machine-2
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+318802@code.staging.launchpad.net

Commit message

Add ModelClient.remove_machine, get unicode from ModelClient.get_full_path.

Description of the change

This branch adds changes useful to Hammer Time.

It adds remove_machine, so that it can return WaitMachineNotPresent.

It changes get_juju_path to return a unicode string (ModelClient.full_path is unicode when user-supplied).

It changes FakeBackend.add_machines so that it behaves more like Juju itself, puking when both -n and a placement directive are specified.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you. I have a trivial request inline.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches