Merge lp:~jelmer/launchpad/re-enable-test_import_bzrsvn into lp:launchpad
Proposed by
Jelmer Vernooij
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jelmer Vernooij | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 13767 | ||||
Proposed branch: | lp:~jelmer/launchpad/re-enable-test_import_bzrsvn | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
102 lines (+17/-14) 2 files modified
lib/lp/codehosting/codeimport/tests/servers.py (+14/-9) lib/lp/codehosting/codeimport/tests/test_workermonitor.py (+3/-5) |
||||
To merge this branch: | bzr merge lp:~jelmer/launchpad/re-enable-test_import_bzrsvn | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benji York (community) | code | Approve | |
Review via email: mp+72411@code.launchpad.net |
Commit message
[r=benji][bug=541526] Re-enable some worker monitor tests that were disabled because of a http client bug in twisted < 10.2.
Description of the change
Re-enable some tests in for the code import worker monitor now that a new Twisted has landed.
These tests were disabled last year because of a bug in the twisted http client which sometimes caused EC2 instances to error. This bug was fixed in twisted 10.2, and Launchpad is now on twisted 11.0. Running these tests half a dozen times locally I also can no longer reproduce the issue.
This also required a fix of the "Connection refused" detection for svn connections, which is slightly different now that subvertpy is used for svn access.
To post a comment you must log in.
This looks good.
Are there any old svn_oo packages we can remove from lp-sourcedeps?