Merge lp:~ralsina/ubuntu-sso-client/fix-939703 into lp:ubuntu-sso-client

[Roberto Alsina]

Make the network detection code return ONLINE if NM is not available (but still UNKNOWN if it's available and fails)

Make the network detection code return ONLINE if NM is not available (but still UNKNOWN if it's available and fails)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2012-01-31 20:12:49 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-02-23 18:47:18 +0000
@@ -94,7 +94,9 @@
         if isinstance(error, self.dbus.exceptions.DBusException) and \
                 error.get_dbus_name() == DBUS_UNKNOWN_SERVICE:
             logger.debug("Network Manager not present")
-            self.call_result_cb(UNKNOWN)
+            # 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))

=== modified file 'ubuntu_sso/networkstate/tests/test_linux.py'
--- ubuntu_sso/networkstate/tests/test_linux.py	2012-01-31 20:12:49 +0000
+++ ubuntu_sso/networkstate/tests/test_linux.py	2012-02-23 18:47:18 +0000
@@ -407,10 +407,10 @@
         self.mocker.result(exc)
         self.mocker.replay()
 
-    def test_nm_not_running(self):
-        """Check the case when NM is not running."""
+    def test_nm_not_installed(self):
+        """Check the case when NM is not installed."""
         self.connect_proxy(TestNmNotAvailableException)
-        self.check_nm_error(self.assertUnknown, TestNmNotAvailableException())
+        self.check_nm_error(self.assertOnline, TestNmNotAvailableException())
 
     def test_dbus_problem(self):
         """Check the case when DBus throws some other exception."""