Merge lp:~dobey/ubuntuone-dev-tools/fix-1119486 into lp:ubuntuone-dev-tools
Proposed by
dobey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 103 | ||||
Merged at revision: | 102 | ||||
Proposed branch: | lp:~dobey/ubuntuone-dev-tools/fix-1119486 | ||||
Merge into: | lp:ubuntuone-dev-tools | ||||
Diff against target: |
112 lines (+20/-9) 3 files modified
ubuntuone/devtools/services/squid.py (+10/-2) ubuntuone/devtools/testcases/tests/test_squid_testcase.py (+5/-3) ubuntuone/devtools/testing/tests/test_txwebserver.py (+5/-4) |
||||
To merge this branch: | bzr merge lp:~dobey/ubuntuone-dev-tools/fix-1119486 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike McCracken (community) | Approve | ||
Alejandro J. Cura (community) | Approve | ||
Review via email: mp+147444@code.launchpad.net |
Commit message
Ignore ESRCH when killing squid process, in event it already died.
Skip a failing test on linux due to ncsa_auth crashing.
Fix dependency on re-export of imports from a twisted module.
To post a comment you must log in.
+1