Merge lp:~robru/ubuntuone-dev-tools/fix-tests into lp:ubuntuone-dev-tools

[Robert Bruce Park]

Fix pylint failures.

ubuntuone-dev-tools is stuck in proposed due to test regressions, this branch fixes up the test run in trunk:

Running style checks...
./ubuntuone/devtools/services/tests/test_squid.py:41:1: E265 block comment should start with '# '
./ubuntuone/devtools/testcases/tests/test_squid_testcase.py:192:9: E265 block comment should start with '# '
./ubuntuone/devtools/testcases/tests/test_squid_testcase.py:199:9: E265 block comment should start with '# '
./ubuntuone/devtools/testcases/tests/test_squid_testcase.py:206:9: E265 block comment should start with '# '
./ubuntuone/devtools/testcases/tests/test_txsocketserver.py:63:10: E111 indentation is not a multiple of four
./ubuntuone/devtools/testcases/tests/test_txsocketserver.py:63:10: E113 unexpected indentation
bin/u1lint:132:16: E713 test for membership should be 'not in'
bin/u1lint:139:16: E713 test for membership should be 'not in'

[James Westby (james-w)]

I wonder if this will merge if I just do this.

review: Approve

[Robert Bruce Park (robru)]

Doesn't look like this branch is set up for auto-merging, you'll have to merge it manually.

Unmerged revisions

108. By Robert Bruce Park on 2015-08-19

Fix pylint errors during test run.

=== modified file 'bin/u1lint'
--- bin/u1lint	2013-05-16 15:40:42 +0000
+++ bin/u1lint	2015-08-19 22:00:25 +0000
@@ -129,14 +129,14 @@
         elif line.startswith("build/") or len(current) < 3:
             pass
         elif filename == current[0]:
-            if not "[W0511]" in current[2]:
+            if "[W0511]" not in current[2]:
                 did_fail = True
             outputs.append("    " + current[1] + ": " + current[2])
         elif filename != current[0]:
             filename = current[0]
             outputs.append("")
             outputs.append(filename + ":")
-            if not "[W0511]" in current[2]:
+            if "[W0511]" not in current[2]:
                 did_fail = True
             outputs.append("    " + current[1] + ": " + current[2])
 
 
=== modified file 'ubuntuone/devtools/services/tests/test_squid.py'
--- ubuntuone/devtools/services/tests/test_squid.py	2013-01-24 18:46:01 +0000
+++ ubuntuone/devtools/services/tests/test_squid.py	2015-08-19 22:00:25 +0000
@@ -38,7 +38,7 @@
 from ubuntuone.devtools.services import squid
 
 # yes, we know names with _ are private
-#pylint: disable=W0212
+# pylint: disable=W0212
 
 
 class PathsTestCase(BaseTestCase):
 
=== modified file 'ubuntuone/devtools/testcases/tests/test_squid_testcase.py'
--- ubuntuone/devtools/testcases/tests/test_squid_testcase.py	2014-01-10 20:01:45 +0000
+++ ubuntuone/devtools/testcases/tests/test_squid_testcase.py	2015-08-19 22:00:25 +0000
@@ -189,21 +189,21 @@
         self.site = SaveSite(root)
         application = service.Application('web')
         self.service_collection = service.IServiceCollection(application)
-        #pylint: disable=E1101
+        # pylint: disable=E1101
         self.tcpserver = internet.TCPServer(0, self.site)
         self.tcpserver.setServiceParent(self.service_collection)
         self.service_collection.startService()
 
     def get_url(self):
         """Build the url for this mock server."""
-        #pylint: disable=W0212
+        # pylint: disable=W0212
         port_num = self.tcpserver._port.getHost().port
         return "http://127.0.0.1:%d/" % port_num
 
     @defer.inlineCallbacks
     def stop(self):
         """Shut it down."""
-        #pylint: disable=E1101
+        # pylint: disable=E1101
         # make the connection time out so that is works with squid3 when
         # the connection is kept alive.
         if self.site.protocol.protocolInstance:
 
=== modified file 'ubuntuone/devtools/testcases/tests/test_txsocketserver.py'
--- ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-11-28 21:45:47 +0000
+++ ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2015-08-19 22:00:25 +0000
@@ -60,7 +60,7 @@
 
     def __init__(self, adder):
         """Create a new instance."""
-         # pb.Root has no __init__
+        # pb.Root has no __init__
         self.adder = adder
 
     def remote_get_adder(self):
 
=== modified file 'ubuntuone/devtools/testing/txcheck.py'
--- ubuntuone/devtools/testing/txcheck.py	2012-11-28 21:45:47 +0000
+++ ubuntuone/devtools/testing/txcheck.py	2015-08-19 22:00:25 +0000
@@ -172,7 +172,10 @@
     """Return predicate which recurses into the tree via given attributes."""
     components = list(components)
     components.reverse()
-    test = lambda node: True
+
+    def test(node):
+        return True
+
     for component in components:
         attr_name = component[0]
         subtests = component[1:]