Merge lp://qastaging/~jml/launchpad/various-ec2-fixes into lp://qastaging/launchpad
Proposed by
Jonathan Lange
| Status: | Merged | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 12721 | ||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~jml/launchpad/various-ec2-fixes | ||||||||||||||||||||||||
| Merge into: | lp://qastaging/launchpad | ||||||||||||||||||||||||
| Diff against target: |
278 lines (+102/-24) 5 files modified
lib/devscripts/autoland.py (+19/-5) lib/devscripts/ec2test/builtins.py (+26/-8) lib/devscripts/ec2test/instance.py (+7/-2) lib/devscripts/ec2test/tests/test_remote.py (+6/-2) lib/devscripts/tests/test_autoland.py (+44/-7) |
||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~jml/launchpad/various-ec2-fixes | ||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| j.c.sackett (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[r=jcsackett][bug=439348,493774,
Description of the change
A whole bunch of fixes for ec2 test. I can't really add much here that's not in the bug reports. The ec2test system isn't super well-tested in general, and I haven't tried very hard to fix that in this branch. I have verified that ec2 update-image and ec2 land still work, that we trust the merge proposal reviewer and that we exclude merge proposals that are approved. I have not verified the EINTR handling (it's tricky) or the bug status fix.
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
This looks like a good grabbag of fixes.