Merge lp:~mandel/ubuntu-sso-client/fix-tcp-activation into lp:ubuntu-sso-client

[Manuel de la Peña]

- Changed tests so that they use u1-dev-tools better and do not get blocked in the clean up (LP: 1009071).

- Changed tests so that they use u1-dev-tools better and do not get blocked in the clean up (LP: 1009071).

Please ensure that you do run the tests using lp:~mandel/ubuntuone-dev-tools/darwin-cleanup

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mandel/ubuntu-sso-client/fix-tcp-activation into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
Starting squid version...
Waiting for squid to start....
ubuntu_sso.main.tests.test_common
  BaseTestCase
    runTest ... [OK]
  CredentialsManagementClearTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementNotFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementOpsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementParamsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementRefCountingTestCase
    test_authorization_denied ... [OK]
    test_autorization_denied_when_ref_count_is_not_positive ... [OK]
    test_clear_credentials ... [OK]
    test_credentials_cleared ... [OK]
    test_credentials_cleared_when_ref_count_is_not_positive ... [OK]
    test_credentials_error ... [OK]
    test_credentials_error_when_ref_count_is_not_positive ... [OK]
    test_credentials_found ... [OK]
    test_credentials_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_not_found ... [OK]
    test_credentials_not_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_stored ... [OK]
    test_credentials_stored_when_ref_count_is_not_positive ... [OK]
    test_find_credentials ... ...

[lp:~mandel/ubuntu-sso-client/fix-tcp-activation]

968. By Manuel de la Peña on 2012-06-19

Fix lint issues.

=== modified file 'ubuntu_sso/utils/tcpactivation.py'
--- ubuntu_sso/utils/tcpactivation.py	2012-05-03 11:42:55 +0000
+++ ubuntu_sso/utils/tcpactivation.py	2012-06-19 16:18:19 +0000
@@ -87,11 +87,13 @@
 
     def clientConnectionLost(self, connector, reason):
         """The connection was lost."""
+        protocol.ClientFactory.clientConnectionLost(self, connector, reason)
         if not self.d.called:
             self.d.callback(False)
 
     def clientConnectionFailed(self, connector, reason):
         """The connection failed."""
+        protocol.ClientFactory.clientConnectionFailed(self, connector, reason)
         if not self.d.called:
             self.d.callback(False)
 

=== modified file 'ubuntu_sso/utils/tests/test_tcpactivation.py'
--- ubuntu_sso/utils/tests/test_tcpactivation.py	2012-05-03 12:36:08 +0000
+++ ubuntu_sso/utils/tests/test_tcpactivation.py	2012-06-19 16:18:19 +0000
@@ -72,7 +72,7 @@
         self.transport.write(data)
 
 
-class FakeServerFactory(protocol.Factory):
+class FakeServerFactory(protocol.ServerFactory):
     """A factory for the test server."""
 
     protocol = FakeServerProtocol
@@ -97,37 +97,6 @@
         self.client = client_description
 
 
-class FakeConnectedClient(object):
-    """Fake class use to patch connections."""
-
-    def __init__(self, testcase, inner):
-        """Create a new instance."""
-        self.testcase = testcase
-        self.inner = inner
-
-    @defer.inlineCallbacks
-    def connect(self, factory):
-        """Connect using the given factory."""
-        # we need to get the class of the factory and patch it
-        yield self.testcase.connect_client(PortDetectFactory)
-        self.inner.factory = self.testcase.client_factory
-        defer.returnValue(self.testcase.connector)
-
-
-class WrapperFactory(object):
-    """Wrapps a factory so that it can be replaced in a test."""
-
-    def __init__(self, factory):
-        self.factory = None
-
-    def __call__(self, *args, **kwargs):
-        return self
-
-    def is_listening(self):
-        """Return if the service is listening."""
-        return self.factory.is_listening()
-
-
 class AsyncSleepTestCase(TestCase):
     """Tests for the async_sleep function."""
 
@@ -231,7 +200,7 @@
         self.assertEqual(config.description, SAMPLE_CLIENT_DESCRIPTION)
 
 
-class ActivationDetectorTestCase(ServerTestCase):
+class ActivationDetectorTestCase(TestCase):
     """Tests for the ActivationDetector class."""
 
     timeoue = 3
@@ -270,15 +239,29 @@
     @defer.inlineCallbacks
     def test_is_already_running(self):
         """The is_already_running method returns True if already started."""
-        inner = WrapperFactory(None)
-
-        self.patch(tcpactivation, 'PortDetectFactory', inner)
-        client = FakeConnectedClient(self, inner)
+        server = self.get_server()
+        self.addCleanup(server.clean_up)
+
+        class TestConnect(object):
+            """A fake connection object."""
+
+            # pylint: disable=E0213
+            @defer.inlineCallbacks
+            def connect(my_self, factory):
+                """A fake connection."""
+
+                connected_factory = yield server.connect_client(
+                        PortDetectFactory)
+                self.patch(factory, 'is_listening',
+                        connected_factory.is_listening)
+                defer.returnValue(connected_factory)
+            # pylint: enable=E0213
 
         self.patch(tcpactivation, 'clientFromString',
-                   lambda *args: client)
-
-        yield self.listen_server(FakeServerFactory)
+                lambda *args: TestConnect())
+
+        yield server.listen_server(protocol.ServerFactory)
+
         # pylint: disable=E1101
         ad = ActivationDetector(self.config)
         result = yield ad.is_already_running()
@@ -420,15 +403,28 @@
     @defer.inlineCallbacks
     def test_get_description_fails_if_service_already_started(self):
         """The get_description method fails if service already started."""
-        inner = WrapperFactory(None)
-
-        self.patch(tcpactivation, 'PortDetectFactory', inner)
-        client = FakeConnectedClient(self, inner)
+        server = self.get_server()
+        self.addCleanup(server.clean_up)
+
+        class TestConnect(object):
+            """A fake connection object."""
+
+            # pylint: disable=E0213
+            @defer.inlineCallbacks
+            def connect(my_self, factory):
+                """A fake connection."""
+
+                connected_factory = yield server.connect_client(
+                        PortDetectFactory)
+                self.patch(factory, 'is_listening',
+                        connected_factory.is_listening)
+                defer.returnValue(connected_factory)
+            # pylint: enable=E0213
 
         self.patch(tcpactivation, 'clientFromString',
-                   lambda *args: client)
+                lambda *args: TestConnect())
 
-        yield self.listen_server(FakeServerFactory)
+        yield server.listen_server(protocol.ServerFactory)
 
         ai = ActivationInstance(self.config)
         yield self.assertFailure(ai.get_server_description(),