Merge lp:~nataliabidart/ubuntu-sso-client/no-more-blocking into lp:ubuntu-sso-client

[Natalia Bidart]

- Remove unused "thread_execute" function (LP: #928581).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntu-sso-client/no-more-blocking into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.tests.test_account
  AccountTestCase
    test_generate_captcha ... [OK]
    test_is_not_validated ... [OK]
    test_is_not_validated_empty_result ... [OK]
    test_is_validated ... [OK]
    test_login_if_http_error ... [OK]
    test_login_if_no_error ... [OK]
    test_register_user_checks_valid_email ... [OK]
    test_register_user_checks_valid_password ... [OK]
    test_register_user_if_status_error ... [OK]
    test_register_user_if_status_error_with_string_message ... [OK]
    test_register_user_if_status_ok ... [OK]
    test_register_user_if_status_unknown ... [OK]
    test_request_password_reset_token_if_http_error ... [OK]
    test_request_password_reset_token_if_status_ok ... [OK]
    test_request_password_reset_token_if_status_unknown ... [OK]
    test_set_new_password_if_http_error ... [OK]
    test_set_new_password_if_status_ok ... [OK]
    test_set_new_password_if_status_unknown ... [OK]
    test_validate_email_if_status_error ... [OK]
    test_validate_email_if_status_error_with_string_message ... [OK]
    test_validate_email_if_status_ok ... [OK]
    test_validate_email_if_status_unknown ... [OK]
  EnvironOverridesTestCase
    test_no_override_service_url ... [OK]
    test_override_service_url ... [OK]
    test_service_url_as_parameter ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.tests.test_account
  TimestampedAuthorizerTestCase
    test_authorize_request_includes_timestamp ... [OK]
ubuntu_sso.tests.test_credentials
  BasicTestCase
    runTest ... [OK]
  ClearCredentialsTestCase
    test_clear_credentials ... [OK]
    test_keyring_failure ... [OK]
  CredentialsAuthDeniedTestCase
    test_auth_denial_cb ... [OK]
  CredentialsCallbacksTestCase
    test_callbacks_are_stored ... [OK]
    test_callbacks_default_to_no_op ... [OK]
    test_creation_parameters_are_stored ... ...

=== modified file 'ubuntu_sso/main/__init__.py'
--- ubuntu_sso/main/__init__.py	2012-02-03 13:54:29 +0000
+++ ubuntu_sso/main/__init__.py	2012-02-08 00:37:21 +0000
@@ -58,7 +58,6 @@
 
 UbuntuSSOProxy = source.UbuntuSSOProxy
 get_sso_client = source.get_sso_client
-thread_execute = source.blocking
 
 
 def except_to_errdict(e):

=== modified file 'ubuntu_sso/main/linux.py'
--- ubuntu_sso/main/linux.py	2012-02-03 13:54:29 +0000
+++ ubuntu_sso/main/linux.py	2012-02-08 00:37:21 +0000
@@ -27,7 +27,6 @@
 
 import os
 import signal
-import threading
 
 import dbus
 import dbus.service
@@ -52,19 +51,6 @@
 logger = setup_logging("ubuntu_sso.main.linux")
 
 
-def blocking(f, app_name, result_cb, error_cb):
-    """Run f in a thread; return or throw an exception thru the callbacks."""
-    def _in_thread():
-        """The part that runs inside the thread."""
-        try:
-            result_cb(app_name, f())
-        except Exception, e:  # pylint: disable=W0703
-            msg = "Exception while running blocking code in a thread:"
-            logger.exception(msg)
-            error_cb(app_name, e)
-    threading.Thread(target=_in_thread).start()
-
-
 class SSOLoginProxy(dbus.service.Object):
     """Login thru the Single Sign On service."""
 

=== modified file 'ubuntu_sso/main/tests/test_common.py'
--- ubuntu_sso/main/tests/test_common.py	2012-01-20 18:08:04 +0000
+++ ubuntu_sso/main/tests/test_common.py	2012-02-08 00:37:21 +0000
@@ -25,7 +25,6 @@
     CredentialsManagement,
     except_to_errdict,
     SSOLogin,
-    thread_execute,
     TIMEOUT_INTERVAL,
     UbuntuSSOService,
 )
@@ -43,22 +42,7 @@
 
 
 class SampleException(Exception):
-    """The exception that will be thrown by the fake thread_execute."""
-
-
-def fake_ok_thread_execute(f, app, cb, eb):
-    """A fake thread_execute function that succeeds."""
-    cb(app, f())
-
-
-def fake_err_thread_execute(f, app, cb, eb):
-    """A fake thread_execute function that fails."""
-    try:
-        f()
-    except Exception, e:  # pylint: disable=W0703
-        eb(app, except_to_errdict(e))
-    else:
-        eb(app, except_to_errdict(SampleException()))
+    """A sample exception."""
 
 
 class FakedProxy(Recorder):
@@ -423,47 +407,6 @@
         self.assertEqual(app_name, APP_NAME)
 
 
-class BlockingFunctionTestCase(TestCase):
-    """Tests for the "thread_execute" function."""
-
-    timeout = 5
-
-    @defer.inlineCallbacks
-    def test_thread_execute(self):
-        """Test the normal behaviour."""
-        d = defer.Deferred()
-        expected_result = "expected result"
-
-        def f():
-            """No failure."""
-            return expected_result
-
-        thread_execute(f, APP_NAME, lambda *a: d.callback(a), d.errback)
-
-        app_name, result = yield d
-
-        self.assertEqual(result, expected_result)
-        self.assertEqual(app_name, APP_NAME)
-
-    @defer.inlineCallbacks
-    def test_thread_execute_error(self):
-        """Test the behaviour when an Exception is raised."""
-        d = defer.Deferred()
-        expected_error_message = "expected error message"
-        expected_exc = SampleException(expected_error_message)
-
-        def f():
-            """Failure."""
-            raise expected_exc
-
-        thread_execute(f, APP_NAME, d.errback, lambda *a: d.callback(a))
-
-        app_name, error = yield d
-
-        self.assertEqual(app_name, APP_NAME)
-        self.assertEqual(error, expected_exc)
-
-
 class CredentialsManagementTestCase(BaseTestCase):
     """Tests for the CredentialsManagement DBus interface."""
 

=== modified file 'ubuntu_sso/main/windows.py'
--- ubuntu_sso/main/windows.py	2012-02-07 14:45:29 +0000
+++ ubuntu_sso/main/windows.py	2012-02-08 00:37:21 +0000
@@ -33,7 +33,6 @@
 
 from twisted.internet import defer
 from twisted.internet.task import LoopingCall
-from twisted.internet.threads import deferToThread
 from twisted.python.failure import Failure
 
 from ubuntu_sso.logger import setup_logging
@@ -88,15 +87,6 @@
     return value
 
 
-def blocking(f, app_name, result_cb, error_cb):
-    """Run f in a thread; return or throw an exception thru the callbacks."""
-    d = deferToThread(f)
-    # the calls in twisted will be called with the args in a diff order,
-    # in order to follow the linux api, we swap them around with a lambda
-    d.addCallback(lambda result, app: result_cb(app, result), app_name)
-    d.addErrback(lambda err, app: error_cb(app, err.value), app_name)
-
-
 class SSOLoginProxy(RemoteService):
     """Login thru the Single Sign On service."""