Merge lp:~smoser/ubuntu-server-ec2-testing/fixes into lp:ubuntu-server-ec2-testing
Status: | Merged |
---|---|
Merged at revision: | 21 |
Proposed branch: | lp:~smoser/ubuntu-server-ec2-testing/fixes |
Merge into: | lp:ubuntu-server-ec2-testing |
Diff against target: |
142 lines (+55/-10) 2 files modified
src/ubuntu/ec2/settings.py (+5/-0) src/ubuntu/ec2/testing.py (+50/-10) |
To merge this branch: | bzr merge lp:~smoser/ubuntu-server-ec2-testing/fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+79174@code.launchpad.net |
Commit message
try harder to get terminated logs, actually terminate with boto 2.0
This adds the terminate_and_wait method to TestCaseExecutor. As seen at
[1], TidyUp would raise an exception and prevent the final retrieval of
logs. Without those final logs, there was no way to debug what went
wrong. We make tidyup use this and basically try harder to get logs
of the terminated instance.
In the "all is well" path, there should be no additional wait, as
terminate_and_wait will recognize that the instance is already terminated.
Also, collect-console will recognize that there already exists console
output, so we wont' overwrite it.
This also fixes a bug in the test suite when using boto 2.0. Natty's
version of boto a boto.ec2.
but that is obviously wrong. Both 2.0 and natty's version have a
'terminate' method, so we use that.
Scott
All looks good to me - I've pulled this and the documentation MP in and added one other minor update - when ebs instances where being stopped they where doing weird internal calls on the instance to make that happen - probably related to the fact that stop actually terminated the instance.
I updated that call to use stop() instead.
I'll merge this in and push a new version to the PPA for oneiric.
Cheers
James