Merge lp:~mandel/ubuntuone-dev-tools/darwin-cleanup into lp:ubuntuone-dev-tools

[Manuel de la Peña]

- Ensure that we only wait for the deferred when a protocol was created server side (LP: #1009408).

- Ensure that we only wait for the deferred when a protocol was created server side (LP: #1009408).

[dobey (dobey)]

Looks ok to me.

review: Approve

[Alejandro J. Cura (alecu)]

"Facotry" -> "Factory"

review: Approve

[lp:~mandel/ubuntuone-dev-tools/darwin-cleanup]

77. By Manuel de la Peña on 2012-06-08

Fix typo.

=== modified file 'bin/u1lint'
--- bin/u1lint	2012-06-05 21:33:33 +0000
+++ bin/u1lint	2012-06-08 14:19:19 +0000
@@ -143,7 +143,7 @@
         config.read([PYLINTRC])
 
         # pylint: disable=E1103
-        return [os.path.join(SRCDIR, item) for item in \
+        return [os.path.join(SRCDIR, item) for item in
                     config.get("MASTER", "ignore").split(",")]
     except (TypeError, ConfigParser.NoOptionError):
         return []
@@ -213,7 +213,7 @@
     failed = False
     ignored = _read_pylintrc_ignored()
     if options.ignored:
-        ignored.extend([os.path.join(SRCDIR, item) for item in \
+        ignored.extend([os.path.join(SRCDIR, item) for item in
                             map(str.strip, options.ignored.split(','))])
 
     if os.environ.get('USE_PYFLAKES'):

=== modified file 'ubuntuone/devtools/testcases/__init__.py'
--- ubuntuone/devtools/testcases/__init__.py	2012-05-14 14:29:25 +0000
+++ ubuntuone/devtools/testcases/__init__.py	2012-06-08 14:19:19 +0000
@@ -63,7 +63,7 @@
 
     def decorator(test_item):
         """Decorate the test so that it is skipped."""
-        if not (isinstance(test_item, type) and\
+        if not (isinstance(test_item, type) and
             issubclass(test_item, TestCase)):
 
             @wraps(test_item)

=== modified file 'ubuntuone/devtools/testcases/tests/test_txsocketserver.py'
--- ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-04-26 14:16:33 +0000
+++ ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-06-08 14:19:19 +0000
@@ -289,7 +289,7 @@
     def test_deferreds(self):
         """Test that the deferreds are not broken."""
         self.assertFalse(self.client_disconnected.called)
-        self.assertFalse(self.server_disconnected.called)
+        self.assertEqual(None, self.server_disconnected)
 
     @defer.inlineCallbacks
     def test_addition(self):

=== modified file 'ubuntuone/devtools/testcases/txsocketserver.py'
--- ubuntuone/devtools/testcases/txsocketserver.py	2012-05-22 14:19:19 +0000
+++ ubuntuone/devtools/testcases/txsocketserver.py	2012-06-08 14:19:19 +0000
@@ -37,7 +37,7 @@
 
 from ubuntuone.devtools.testcases import BaseTestCase
 
-# no init method +  twisted common warnings
+# no init method + twisted common warnings
 # pylint: disable=W0232, C0103, E1101
 
 
@@ -64,6 +64,25 @@
     return ServerTidyProtocol
 
 
+def server_factory_factory(cls):
+    """Factory that creates special types of factories for tests."""
+
+    if cls is None:
+        cls = protocol.ServerFactory
+
+    class TidyServerFactory(cls):
+        """A tidy factory."""
+
+        testserver_on_connection_lost = None
+
+        def buildProtocol(self, addr):
+            prot = cls.buildProtocol(self, addr)
+            self.testserver_on_connection_lost = defer.Deferred()
+            return prot
+
+    return TidyServerFactory
+
+
 def client_protocol_factory(cls):
     """Factory to create tidy protocols."""
 
@@ -75,13 +94,13 @@
 
         def connectionLost(self, *a):
             """Connection list."""
-            # pylint: disable=W0212
-            if (self.factory._disconnecting
-                    and self.factory.testserver_on_connection_lost is not None
-                    and not self.factory.testserver_on_connection_lost.called):
-                self.factory.testserver_on_connection_lost.callback(self)
-            # pylint: enable=W0212
             cls.connectionLost(self, *a)
+            # pylint: disable=W0212
+            if (self.factory._disconnecting
+                    and self.factory.testserver_on_connection_lost is not None
+                    and not self.factory.testserver_on_connection_lost.called):
+                self.factory.testserver_on_connection_lost.callback(self)
+            # pylint: enable=W0212
 
     return ClientTidyProtocol
 
@@ -120,9 +139,9 @@
     def listen_server(self, server_class, *args, **kwargs):
         """Start a server in a random port."""
         from twisted.internet import reactor
-        self.server_factory = server_class(*args, **kwargs)
+        tidy_class = server_factory_factory(server_class)
+        self.server_factory = tidy_class(*args, **kwargs)
         self.server_factory._disconnecting = False
-        self.server_factory.testserver_on_connection_lost = defer.Deferred()
         self.server_factory.protocol = server_protocol_factory(
                                                  self.server_factory.protocol)
         endpoint = endpoints.serverFromString(reactor,
@@ -161,15 +180,21 @@
             # clean client and server
             self.server_factory._disconnecting = True
             self.client_factory._disconnecting = True
+            d = defer.maybeDeferred(self.listener.stopListening)
             self.connector.transport.loseConnection()
-            d = defer.maybeDeferred(self.listener.stopListening)
-            return defer.gatherResults([d,
-                self.client_factory.testserver_on_connection_lost,
-                self.server_factory.testserver_on_connection_lost])
+            if self.server_factory.testserver_on_connection_lost:
+                return defer.gatherResults([d,
+                    self.client_factory.testserver_on_connection_lost,
+                    self.server_factory.testserver_on_connection_lost])
+            else:
+                return defer.gatherResults([d,
+                    self.client_factory.testserver_on_connection_lost])
         if self.listener:
             # just clean the server since there is no client
+            # pylint: disable=W0201
             self.server_factory._disconnecting = True
             return defer.maybeDeferred(self.listener.stopListening)
+            # pylint: enable=W0201
 
 
 class TidyTCPServer(TidySocketServer):