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

[dobey]

Ignore a new error that comes from pylint.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~dobey/ubuntuone-dev-tools/update-4-2]

102. By dobey on 2013-01-24

Ignore a new error that comes from pylint.

=== modified file 'ubuntuone/devtools/services/tests/test_squid.py'
--- ubuntuone/devtools/services/tests/test_squid.py	2012-11-28 21:45:47 +0000
+++ ubuntuone/devtools/services/tests/test_squid.py	2013-01-24 21:07:24 +0000
@@ -377,5 +377,8 @@
         self.patch(self.runner, '_is_squid_running', lambda: False)
         ex = self.assertRaises(squid.SquidLaunchError,
                                self.runner.start_service)
+        # New error that happens in Ubuntu 13.04
+        # pylint: disable=E1103
         self.assertTrue(any([out in arg.encode("utf8") for arg in ex.args]))
         self.assertTrue(any([err in arg.encode("utf8") for arg in ex.args]))
+        # pylint: enable=E1103