Merge lp:~alecu/ubuntu-sso-client/other-nm-errors into lp:ubuntu-sso-client

[Alejandro J. Cura]

- Any error while getting the state from NM is now considered as ONLINE (LP: #1062051).

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2012-06-22 20:03:57 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-10-05 15:01:35 +0000
@@ -33,6 +33,7 @@
 from twisted.internet import defer
 
 from ubuntu_sso.networkstate import NetworkFailException
+# pylint: disable=W0611
 from ubuntu_sso.networkstate.networkstates import (
     ONLINE, OFFLINE, UNKNOWN,
 
@@ -40,12 +41,12 @@
     NM_STATE_CONNECTED_LIST,
     NM_STATE_DISCONNECTED_LIST,
     )
+# pylint: enable=W0611
 from ubuntu_sso.logger import setup_logging
 logger = setup_logging("ubuntu_sso.networkstate")
 
 NM_DBUS_INTERFACE = "org.freedesktop.NetworkManager"
 NM_DBUS_OBJECTPATH = "/org/freedesktop/NetworkManager"
-DBUS_UNKNOWN_SERVICE = "org.freedesktop.DBus.Error.ServiceUnknown"
 
 
 class NetworkManagerState(object):
@@ -72,16 +73,11 @@
 
     def got_error(self, error):
         """Called by DBus when the state is retrieved from NM."""
-        if isinstance(error, self.dbus.exceptions.DBusException) and \
-                error.get_dbus_name() == DBUS_UNKNOWN_SERVICE:
-            logger.debug("Network Manager not present")
-            # Assuming since Network Manager is not installed,
-            # the user has connected in some other way
-            self.call_result_cb(ONLINE)
-        else:
-            logger.error("Error contacting NetworkManager: %s" %
-                             str(error))
-            self.call_result_cb(UNKNOWN)
+        # Assuming since Network Manager is not running,
+        # the user has connected in some other way
+        logger.error("Error contacting NetworkManager: %s" %
+                         str(error))
+        self.call_result_cb(ONLINE)
 
     def state_changed(self, state):
         """Called when a signal is emmited by Network Manager."""

=== modified file 'ubuntu_sso/networkstate/tests/test_linux.py'
--- ubuntu_sso/networkstate/tests/test_linux.py	2012-05-30 17:44:13 +0000
+++ ubuntu_sso/networkstate/tests/test_linux.py	2012-10-05 15:01:35 +0000
@@ -56,7 +56,6 @@
 )
 
 from ubuntu_sso.networkstate.linux import (is_machine_connected,
-    DBUS_UNKNOWN_SERVICE,
     NM_DBUS_INTERFACE,
     NM_DBUS_OBJECTPATH,
 )
@@ -174,7 +173,7 @@
         self.assertEqual(nms.state_signal.interface,
             "org.freedesktop.NetworkManager")
         self.assertEqual(self.network_changes,
-            [UNKNOWN, ONLINE, OFFLINE, ONLINE])
+            [ONLINE, ONLINE, OFFLINE, ONLINE])
         self.assertFalse(nms.state_signal.removed)
 
     @inlineCallbacks
@@ -213,15 +212,6 @@
         yield self.assertFailure(is_machine_connected(), NetworkFailException)
 
 
-class TestNmNotAvailableException(Exception):
-
-    """An exception to test unavailability conditions."""
-
-    def get_dbus_name(self):
-        """The real name of the dbus error when NM is not running."""
-        return DBUS_UNKNOWN_SERVICE
-
-
 class NetworkManagerBaseTestCase(MockerTestCase):
     """Base test case for NM state tests."""
 
@@ -251,7 +241,6 @@
 
         proxymock.Get(ARGS, KWARGS)
         if exc is not None:
-            self.expect(self.dbusmock.exceptions.DBusException)
             self.mocker.result(exc)
         self.mocker.replay()
 
@@ -367,16 +356,15 @@
     def mock_except_while_getting_proxy(self, exc):
         """Simulate an exception while getting the DBus proxy object."""
         self.mocker.throw(exc)
-        self.expect(self.dbusmock.exceptions.DBusException)
         self.mocker.result(exc)
         self.mocker.replay()
 
-    def test_nm_not_installed(self):
-        """Check the case when NM is not installed."""
-        self.connect_proxy(TestNmNotAvailableException)
-        self.check_nm_error(self.assertOnline, TestNmNotAvailableException())
+    def test_nm_check_errors(self):
+        """Trying to reach NM fails with some error."""
+        self.connect_proxy(Exception)
+        self.check_nm_error(self.assertOnline, Exception())
 
     def test_dbus_problem(self):
         """Check the case when DBus throws some other exception."""
         self.mock_except_while_getting_proxy(TestException)
-        self.get_nms(self.assertUnknown)
+        self.get_nms(self.assertOnline)