Merge lp:~dobey/ubuntu-sso-client/fix-no-dbus into lp:ubuntu-sso-client

[dobey]

Trap DBusException when getting the SessionBus, and add a test case for it

[Roberto Alsina (ralsina)]

r968 looks good.

review: Approve

[Alejandro J. Cura (alecu)]

Code looks good; all tests pass on windows.

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1 for tests on MAC OS

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntu-sso-client/fix-no-dbus 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:~dobey/ubuntu-sso-client/fix-no-dbus]

969. By dobey on 2012-06-13

Fix lint issues

=== modified file 'ubuntu_sso/main/linux.py'
--- ubuntu_sso/main/linux.py	2012-04-10 10:43:48 +0000
+++ ubuntu_sso/main/linux.py	2012-06-13 16:53:19 +0000
@@ -342,10 +342,15 @@
 
     def __init__(self, root):
         self.root = root
-        self.bus = dbus.SessionBus()
         self.sso_login = None
         self.cred_manager = None
 
+        try:
+            self.bus = dbus.SessionBus()
+        except dbus.service.DBusException as e:
+            logger.exception(e)
+            shutdown_func()
+
     def start(self):
         """Start listening, nothing async to be done in this platform."""
         # Register DBus service for making sure we run only one instance

=== added file 'ubuntu_sso/main/tests/test_linux.py'
--- ubuntu_sso/main/tests/test_linux.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/main/tests/test_linux.py	2012-06-13 16:53:19 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Tests for the main SSO Linux client code."""
+
+# pylint: disable=C0103
+do_tests = False
+try:
+    import dbus
+    import dbus.service
+    from ubuntu_sso.main import linux as main
+    do_tests = True
+except ImportError:
+    do_tests = False
+# pylint enable=C0103
+
+from ubuntuone.devtools.testcases import BaseTestCase, skipIf
+
+
+@skipIf(do_tests != True, 'Tests only work with DBus and linux imports.')
+class LinuxProxyTestCase(BaseTestCase):
+    """Test some Linux specific cases."""
+
+    def test_dbus_missing_exists_clean(self):
+        """Test that dbus-daemon not being available gives us a clean exit."""
+        def patched(*args, **kwargs):
+            """Method to patch in for testing."""
+            raise dbus.service.DBusException(
+                'org.freedesktop.DBus.Error.NoServer')
+
+        self.patch(dbus, "SessionBus", patched)
+        self.patch(main, "shutdown_func", patched)
+        self.assertRaises(dbus.service.DBusException,
+                          main.UbuntuSSOProxy, None)