Merge lp:~dobey/ubuntuone-dev-tools/update-4-2 into lp:ubuntuone-dev-tools/stable-4-2

Proposed by dobey on 2013-01-24
Status: Merged
Approved by: Roberto Alsina on 2013-01-24
Approved revision: no longer in the source branch.
Merged at revision: 102
Proposed branch: lp:~dobey/ubuntuone-dev-tools/update-4-2
Merge into: lp:ubuntuone-dev-tools/stable-4-2
Diff against target: 12 lines (+3/-0)
1 file modified
ubuntuone/devtools/services/tests/test_squid.py (+3/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-dev-tools/update-4-2
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2013-01-24 Approve on 2013-01-24
Review via email: mp+144802@code.launchpad.net

Commit message

Ignore a new error that comes from pylint.

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve
102. By dobey on 2013-01-24

Ignore a new error that comes from pylint.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/devtools/services/tests/test_squid.py'
2--- ubuntuone/devtools/services/tests/test_squid.py 2012-11-28 21:45:47 +0000
3+++ ubuntuone/devtools/services/tests/test_squid.py 2013-01-24 21:07:24 +0000
4@@ -377,5 +377,8 @@
5 self.patch(self.runner, '_is_squid_running', lambda: False)
6 ex = self.assertRaises(squid.SquidLaunchError,
7 self.runner.start_service)
8+ # New error that happens in Ubuntu 13.04
9+ # pylint: disable=E1103
10 self.assertTrue(any([out in arg.encode("utf8") for arg in ex.args]))
11 self.assertTrue(any([err in arg.encode("utf8") for arg in ex.args]))
12+ # pylint: enable=E1103

Subscribers

People subscribed via source and target branches

to all changes: