juju-ci-tools

Merge lp://staging/~abentley/juju-ci-tools/fix-assess-public-clouds into lp://staging/juju-ci-tools

  1. fix-assess-public-clouds
  2. Merge into trunk
Proposed by Aaron Bentley
Status: Merged
Merged at revision: 1824
Proposed branch: lp://staging/~abentley/juju-ci-tools/fix-assess-public-clouds
Merge into: lp://staging/juju-ci-tools
Diff against target: 239 lines (+77/-36)
5 files modified
assess_cloud.py (+5/-1)
assess_public_clouds.py (+7/-4)
deploy_stack.py (+6/-2)
tests/test_assess_public_clouds.py (+35/-18)
tests/test_deploy_stack.py (+24/-11)
To merge this branch: bzr merge lp://staging/~abentley/juju-ci-tools/fix-assess-public-clouds
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+314019@code.staging.launchpad.net

Commit message

Fix assess-public-cloud.

Description of the change

This branch provides fixes for assess_public_clouds.

It fixes bug #1650295: assess_public_clouds handles errors poorly

The error handling was broken; tests that failed were
1. being treated as successful
2. preventing all other tests from running.

This was due to BootstrapManager.booted_context's exception handling. It automatically calls sys.exit. This makes sense when only a single thing is being tested, but not when multiple things are, as here. This branch makes that behaviour optional.

The timeout for remove-machine on Azure was too short, causing spurious test failures. This branch changes the timeout based on whether the provider is Azure.

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

Thank you.

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