Merge into trunk : no-kill-combined : Code : juju-ci-tools

Merge lp://staging/~abentley/juju-ci-tools/no-kill-combined into lp://staging/juju-ci-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 1859
Proposed branch: lp://staging/~abentley/juju-ci-tools/no-kill-combined
Merge into: lp://staging/juju-ci-tools
Diff against target: 179 lines (+80/-13)
2 files modified
To merge this branch: bzr merge lp://staging/~abentley/juju-ci-tools/no-kill-combined
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+315605@code.staging.launchpad.net

Commit message

Do not run assess_kill_controller for 'combined'.

Description of the change

Fix bug #1659326: assess_cloud "combined" also does "kill-controller"

The fix is simple, but main was untested (because main is typically painful to test). This branch adds tests for main and fixes the bug.

In order to test main, it extracts test functionality from TestAssessCloudProvisioning, TestAssessCloudKillController and TestAssessCloudCombined.

It also strengthens these tests by ensuring that no extra juju commands are issued. It does this by implementing strip_calls, and doing an exact match on the remaining calls.

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

Thank you.

review: Approve (code)

Preview Diff

Failed to fetch available diffs.

[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