Merge lp://staging/~sinzui/juju-ci-tools/teardown-before-next into lp://staging/juju-ci-tools

Proposed by Curtis Hovey
Status: Merged
Merged at revision: 1912
Proposed branch: lp://staging/~sinzui/juju-ci-tools/teardown-before-next
Merge into: lp://staging/juju-ci-tools
Diff against target: 390 lines (+130/-142)
2 files modified
assess_storage.py (+96/-108)
tests/test_assess_storage.py (+34/-34)
To merge this branch: bzr merge lp://staging/~sinzui/juju-ci-tools/teardown-before-next
Reviewer Review Type Date Requested Status
Juju Release Engineering Pending
Review via email: mp+318300@code.staging.launchpad.net

Description of the change

Remove services when each test finishes.

The assess_storage test has often failed because AWS cannot delete all the machines in the allotted 10 minutes. The test is failing more frequently now that juju is doing a better job of cleanup storage.

This branch updates the main test to call client.remove_service after each sub-test. The speeds the test up because AWS can delete services faster than it cna deploy the next charm for testing. destroy-controller has fewer machines to delete.

The subtests are no-longer sequential. This fix allowed me to remove the previous test results from the current test. \o/

I reformatted and named the results so that we do not need to guess that expected_tmpfs is for the tmpfs test.

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches