Merge lp:~diegosarmentero/ubuntu-sso-client/network-detect into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed: Missing page: No network detected (LP: #804610).

Fixed: Missing page: No network detected (LP: #804610).

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

796. By Diego Sarmentero on 2011-09-26

lint issues fixed.

[Natalia Bidart (nataliabidart)]

The method is_machine_connected should return something, no? Either a boolean if the result is synchronous, or a deferred.

review: Needs Information

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

797. By Diego Sarmentero on 2011-09-29

Improving networkstate to support is_machine_connected for both: linux and windows.

[Natalia Bidart (nataliabidart)]

* Can you please change the docstring to be:

"""Return a deferred that when fired, will return True if the machine is online."""

* Do not add this check:

if not d.called:

if the deferred was already called, then we have a bug we need to solve.

* I think this is not correct:

result = (state != OFFLINE)

online will it be:

result = int(state) in NM_STATE_CONNECTED_LIST

* I think you need to refactor the test, or maybe you forgot a commit/push? The tests should patch NetworkManagerState and assert over the returned deferred.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Also, the windows tets for is_already_connected needs to be modified so they assert a deferred is returned and when fired, return the proper result.

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

798. By Diego Sarmentero on 2011-10-03

Improved tests.

[Natalia Bidart (nataliabidart)]

I still get lint issues:

ubuntu_sso/networkstate/tests/test_windows.py:
    126: [C0111, FakeWininet] Missing docstring
    130: [C0103, FakeWininet.InternetGetConnectedState] Invalid name "InternetGetConnectedState" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

799. By Diego Sarmentero on 2011-10-03

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

This docstring is not pep-257 compliant:

    """Return a deferred that when fired, will return True if the

    machine is online."""

must be something like:

    """Return a deferred that when fired, returns if the machine is online."""

* Why you patch dbus on ubuntu_sso/networkstate/tests/test_linux.py? I see you use it in the first test, but that test is not testing real functionality.

You need to patch the NetworkManagerState at setUp time, and change the fake implementation so you can customize the returned state. That way, you can safely ensure that your code is returning True when the result is in the NM_STATE_CONNECTED_LIST (so you need to have a test for each element inside NM_STATE_CONNECTED_LIST).

So, summing up:

 - Remove the 'fake_network_manager' legend from test names
 - Build a fake NetworkManagerState that behaves more like the real one (ie make it so it can returns any code from the constant list)
 - You should have a test per each constant, asserting either True or False accordingly.

* Since is_machine_connected returns a deferred, the test should use that deferred as such. So, as soon as is_machine_conencted finishes, you can't assume the returned deferred is fired, so you need to yield on it (and thus make the test an inlinecallback generator). Same applies to the windows tests.

* In both implementation, the deferred you're returning should errback if there is any error. So you'd need to add try-except clauses to the calculation of the net state and errback the deferred on error.

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

800. By Diego Sarmentero on 2011-10-06

Improved use of Deferred.

801. By Diego Sarmentero on 2011-10-07

Improved Sign In Page flow, to use check_connection.

[Alejandro J. Cura (alecu)]

The branch looks mostly fine, but here are a few comments:
--
Instead of "Exception(NETWORK_FAIL)", we should use a new custom exception (like NetworkFailException), and use it from both platform modules, and to compare on tests (instead of comparing with the error string).
--
It's usually error prone to set class attributes (or any other global state) from tests, so instead of:

   FakeNetworkManagerState.connection_state = NM_STATE_CONNECTED_OLD

please use something like:

   self.patch(FakeNetworkManagerState, "connection_state", NM_STATE_CONNECTED_OLD)
--
thanks!

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

802. By Diego Sarmentero on 2011-10-07

merge

803. By Diego Sarmentero on 2011-10-07

Improved Network state.

804. By Diego Sarmentero on 2011-10-11

merge

[Natalia Bidart (nataliabidart)]

Lots of lint issues! :-)

== Python Lint Notices ==

ubuntu_sso/networkstate/__init__.py:
    30: [C0111, NetworkFailException] Missing docstring

ubuntu_sso/networkstate/linux.py:
    146: [W0702, is_machine_connected] No exception type(s) specified

ubuntu_sso/networkstate/tests/test_linux.py:
    80: [C0103, TestConnection.test_is_machine_connected_NM_STATE_CONNECTED_OLD] Invalid name "test_is_machine_connected_NM_STATE_CONNECTED_OLD" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    88: [C0103, TestConnection.test_is_machine_connected_NM_STATE_CONNECTED_GLOBAL] Invalid name "test_is_machine_connected_NM_STATE_CONNECTED_GLOBAL" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    96: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_NM_STATE_UNKNOWN] Invalid name "test_is_machine_disconnected_NM_STATE_NM_STATE_UNKNOWN" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    104: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_ASLEEP_OLD] Invalid name "test_is_machine_disconnected_NM_STATE_ASLEEP_OLD" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    112: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_ASLEEP] Invalid name "test_is_machine_disconnected_NM_STATE_ASLEEP" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    120: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_CONNECTING_OLD] Invalid name "test_is_machine_disconnected_NM_STATE_CONNECTING_OLD" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    128: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_CONNECTING] Invalid name "test_is_machine_disconnected_NM_STATE_CONNECTING" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    136: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_CONNECTED_LOCAL] Invalid name "test_is_machine_disconnected_NM_STATE_CONNECTED_LOCAL" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    144: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_CONNECTED_SITE] Invalid name "test_is_machine_disconnected_NM_STATE_CONNECTED_SITE" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    152: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_DISCONNECTED_OLD] Invalid name "test_is_machine_disconnected_NM_STATE_DISCONNECTED_OLD" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    160: [C0103, TestConnection.test_is_machine_disconnected_NM_STATE_DISCONNECTED] Invalid name "test_is_machine_disconnected_NM_STATE_DISCONNECTED" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))
    174: [W0703, TestConnection.test_is_machine_defer_error] Catch "Exception"

ubuntu_sso/networkstate/tests/test_windows.py:
    184: [W0703, TestConnection.test_is_machine_connected_error] Catch "Exception"

ubuntu_sso/networkstate/windows.py:
    183: [W0702, is_machine_connected] No exception type(s) specified

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

805. By Diego Sarmentero on 2011-10-12

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

Lint issues still appears:

== Python Lint Notices ==

ubuntu_sso/networkstate/tests/test_linux.py:
    174: [W0703, TestConnection.test_is_machine_defer_error] Catch "Exception"

ubuntu_sso/networkstate/tests/test_windows.py:
    184: [W0703, TestConnection.test_is_machine_connected_error] Catch "Exception"

ubuntu_sso/networkstate/windows.py:
    183: [W0702, is_machine_connected] No exception type(s) specified

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

I keep having the same lint issues.

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

806. By Diego Sarmentero on 2011-10-17

Fixed lint issues

807. By Diego Sarmentero on 2011-10-18

merge

808. By Diego Sarmentero on 2011-10-18

Fixed lint issue.

[Natalia Bidart (nataliabidart)]

I'm now having these test errors when running ./run-tests -qt under Linux:

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/nessita/canonical/ussoc/review_network-detect/ubuntu_sso/qt/tests/test_controllers.py", line 755, in test_set_next_existing
    self.controller._set_next_existing()
  File "/home/nessita/canonical/ussoc/review_network-detect/ubuntu_sso/qt/controllers.py", line 168, in _set_next_existing
    self.view.check_connection()
exceptions.AttributeError: 'FakeChooseSignInView' object has no attribute 'check_connection'

ubuntu_sso.qt.tests.test_controllers.ChooseSignInControllerTestCase.test_set_next_existing
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/nessita/canonical/ussoc/review_network-detect/ubuntu_sso/qt/tests/test_controllers.py", line 762, in test_set_next_new
    self.controller._set_next_new()
  File "/home/nessita/canonical/ussoc/review_network-detect/ubuntu_sso/qt/controllers.py", line 174, in _set_next_new
    self.view.check_connection()
exceptions.AttributeError: 'FakeChooseSignInView' object has no attribute 'check_connection'

ubuntu_sso.qt.tests.test_controllers.ChooseSignInControllerTestCase.test_set_next_new
-------------------------------------------------------------------------------

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

I get the same errors today.

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

809. By Diego Sarmentero on 2011-10-20

Fixed tests.

[Diego Sarmentero (diegosarmentero)]

> I get the same errors today.

Fixed

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

810. By Diego Sarmentero on 2011-10-20

Reverted commented code

[Natalia Bidart (nataliabidart)]

Code looks good, but I would recommend these improvements:

* Do not hardcode any message for NetworkFailException, so we can build the exception with whatever message we want/need.

* on is_machine_connected, within the except clause, I would grab the exception and use that to build the NetworkFailException. Also, always, always log the errors (the same 2 changes apply to the windows version). A mock would be:

def is_machine_connected():
    """Return a deferred that when fired, returns if the machine is online."""
    d = defer.Deferred()

    def got_state(state):
        """The state was retrieved from the Network Manager."""
        result = int(state) in NM_STATE_CONNECTED_LIST
        d.callback(result)

    try:
        network = NetworkManagerState(got_state)
        network.find_online_state()
    except Exception, e: # pylint: disable=W0703
        logger.exception('is_machine_connected failed with:')
        d.errback(NetworkFailException(e))

    return d

* This test code (the same applies to the windows version):

        # pylint: disable=W0703
        try:
            yield is_machine_connected()
        except Exception, reason:
            self.assertEqual(type(reason), NetworkFailException)
        # pylint: enable=W0703

should be written like this:

        yield self.assertFailure(is_machine_connected(), NetworkFailException)

otherwise, in your version of the code, there is no test failure if the except clause was not exercised.

* Can you also call patch in the windows tests instead of "FakeWininet.connection_state = 1"?

* No need to change this, but using "d" as a variable, in the twisted context, usually means that the 'd' is a deferred. In the TestConnection tests, you're using as the result of the deferred, so is usually a better choice to use "result = yield <the_deferred>".

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

811. By Diego Sarmentero on 2011-10-24

reverting changes

812. By Diego Sarmentero on 2011-10-24

Reverted changes from success page upload by mistake.

[Natalia Bidart (nataliabidart)]

* Lint error:

ubuntu_sso/networkstate/linux.py:
    145: [W0703, is_machine_connected] Catch "Exception"

* Also, there is no need to define and call super on __init__ in the NetworkFailException class.

* This docstring is not pep-257 correct:

    """Test the state of the connection.

    This TestCase tests over all the connection states possible."""

It should be:

    """Test the state of the connection.

    This TestCase tests over all the connection states possible.

    """

* Remember to fix the test test_is_machine_defer_error to use self.assertFailure (instead of a try-except block), in windows is changed but not in the linux code.

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

813. By Diego Sarmentero on 2011-10-28

Fixed test and lint issues.

[Natalia Bidart (nataliabidart)]

I guess this is a typo:

    """Return a deferred that when fired, will return True if the

    machine is online."""

since that is not a pep-257 compliant docstring. You could use the same docstring as in the linux implementation.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Also, running the suite gives me errors, but trunk works OK:

===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.7/ubuntuone-dev-tools/ubuntuone/devtools/testing/txcheck.py", line 355, in run
    raise problem
ubuntuone.devtools.testing.txcheck.MissingReturnValue: MissingReturnValue for ubuntu_sso.networkstate.tests.test_linux.TestConnection.setUp

ubuntuone.devtools.testing.txcheck.TXCheckTest.runTest
===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.7/ubuntuone-dev-tools/ubuntuone/devtools/testing/txcheck.py", line 355, in run
    raise problem
ubuntuone.devtools.testing.txcheck.SuperResultDiscarded: SuperResultDiscarded for ubuntu_sso.networkstate.tests.test_linux.TestConnection.setUp

ubuntuone.devtools.testing.txcheck.TXCheckTest.runTest

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

814. By Diego Sarmentero on 2011-11-07

merge

815. By Diego Sarmentero on 2011-11-07

merge

816. By Diego Sarmentero on 2011-11-07

Fixed tests and lint issue.

817. By Diego Sarmentero on 2011-11-07

Tests fixed.

[Natalia Bidart (nataliabidart)]

Looks good!

Please fix the docstring

(01:59:04 PM) nessita: def is_machine_connected():
(01:59:04 PM) nessita: """Return a deferred that when fired, will return True if the
(01:59:04 PM) nessita: machine is online."""

before landing.

review: Approve

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

818. By Diego Sarmentero on 2011-11-07

Fixed docstring.

819. By Diego Sarmentero on 2011-11-11

merge

820. By Diego Sarmentero on 2011-11-14

success ui updated

821. By Diego Sarmentero on 2011-11-14

merge

822. By Diego Sarmentero on 2011-11-14

success integration.

[Alejandro J. Cura (alecu)]

The branch looks great!
----
Just a small request:

Since is_machine_connected() is not an async function on windows, it could be shortened a fair amount by using defer.succeed and defer.fail, like this:

def is_machine_connected():
    """Return a deferred that when fired, returns if the machine is online."""
    try:
        wininet = windll.wininet
        flags = DWORD()
        connected = wininet.InternetGetConnectedState(byref(flags), None)
        return defer.succeed(connected == 1)
    except Exception, e:
        logger.exception('is_machine_connected failed with:')
        return defer.fail(NetworkFailException(e))

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/network-detect]

823. By Diego Sarmentero on 2012-01-04

merge

824. By Diego Sarmentero on 2012-01-04

is_machine_connect improved.

[Alejandro J. Cura (alecu)]

Tests pass, code looks good: approved!

review: Approve

=== modified file 'ubuntu_sso/networkstate/__init__.py'
--- ubuntu_sso/networkstate/__init__.py	2011-11-08 15:06:00 +0000
+++ ubuntu_sso/networkstate/__init__.py	2012-01-04 16:53:28 +0000
@@ -26,15 +26,23 @@
 OFFLINE = None
 UNKNOWN = None
 
+
+class NetworkFailException(Exception):
+
+    """Exception for when the network detect process fails."""
+
+
 if sys.platform == 'win32':
     from ubuntu_sso.networkstate import windows
     NetworkManagerState = windows.NetworkManagerState
     ONLINE = windows.ONLINE
     OFFLINE = windows.OFFLINE
     UNKNOWN = windows.UNKNOWN
+    is_machine_connected = windows.is_machine_connected
 else:
     from ubuntu_sso.networkstate import linux
     NetworkManagerState = linux.NetworkManagerState
     ONLINE = linux.ONLINE
     OFFLINE = linux.OFFLINE
     UNKNOWN = linux.UNKNOWN
+    is_machine_connected = linux.is_machine_connected

=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2011-11-08 15:06:00 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-01-04 16:53:28 +0000
@@ -21,6 +21,9 @@
 
 import dbus
 
+from twisted.internet import defer
+
+from ubuntu_sso.networkstate import NetworkFailException
 from ubuntu_sso.logger import setup_logging
 logger = setup_logging("ubuntu_sso.networkstate")
 
@@ -125,3 +128,24 @@
                          error_handler=self.got_error)
         except Exception, e:  # pylint: disable=W0703
             self.got_error(e)
+
+
+def is_machine_connected():
+    """Return a deferred that when fired, returns if the machine is online."""
+    d = defer.Deferred()
+
+    def got_state(state):
+        """The state was retrieved from the Network Manager."""
+        result = int(state) in NM_STATE_CONNECTED_LIST
+        d.callback(result)
+
+    # pylint: disable=W0702, W0703
+    try:
+        network = NetworkManagerState(got_state)
+        network.find_online_state()
+    except Exception, e:
+        logger.exception('is_machine_connected failed with:')
+        d.errback(NetworkFailException(e))
+    # pylint: enable=W0702, W0703
+
+    return d

=== modified file 'ubuntu_sso/networkstate/tests/test_linux.py'
--- ubuntu_sso/networkstate/tests/test_linux.py	2011-11-08 15:06:00 +0000
+++ ubuntu_sso/networkstate/tests/test_linux.py	2012-01-04 16:53:28 +0000
@@ -19,9 +19,18 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for the network state detection code."""
 
+from twisted.internet.defer import inlineCallbacks
+
+from ubuntu_sso.tests import TestCase
 from ubuntu_sso.networkstate import (NetworkManagerState,
                                      ONLINE, OFFLINE, UNKNOWN)
-from ubuntu_sso.networkstate.linux import  (DBUS_UNKNOWN_SERVICE,
+
+from ubuntu_sso.networkstate import NetworkFailException
+from ubuntu_sso.networkstate import linux
+from ubuntu_sso.networkstate.linux import  (is_machine_connected,
+                                            DBUS_UNKNOWN_SERVICE,
+                                            NM_STATE_ASLEEP,
+                                            NM_STATE_ASLEEP_OLD,
                                             NM_STATE_CONNECTING,
                                             NM_STATE_CONNECTING_OLD,
                                             NM_STATE_CONNECTED_OLD,
@@ -29,7 +38,8 @@
                                             NM_STATE_CONNECTED_SITE,
                                             NM_STATE_CONNECTED_GLOBAL,
                                             NM_STATE_DISCONNECTED,
-                                            NM_STATE_DISCONNECTED_OLD)
+                                            NM_STATE_DISCONNECTED_OLD,
+                                            NM_STATE_UNKNOWN)
 
 from mocker import ARGS, KWARGS, ANY, MockerTestCase
 
@@ -41,6 +51,131 @@
         return "Test Exception Message"
 
 
+class FakeNetworkManagerState(object):
+
+    """Fake Network Manager State."""
+
+    connection_state = None
+
+    def __init__(self, function):
+        """Initialize Fake class."""
+        self.call_function = function
+
+    def find_online_state(self):
+        """Fake find_online_state for linux module."""
+        self.call_function(self.connection_state)
+
+
+class TestConnection(TestCase):
+
+    """Test the state of the connection.
+
+    This TestCase tests over all the connection states possible.
+
+    """
+
+    @inlineCallbacks
+    def setUp(self):
+        """Setup the mocker dbus object tree."""
+        yield super(TestConnection, self).setUp()
+        self.patch(linux, "NetworkManagerState", FakeNetworkManagerState)
+
+    @inlineCallbacks
+    def test_is_machine_connected_nm_state_connected_old(self):
+        """Fake the NetworkManagerState with connected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_CONNECTED_OLD)
+        d = yield is_machine_connected()
+        self.assertTrue(d)
+
+    @inlineCallbacks
+    def test_is_machine_connected_nm_state_connected_global(self):
+        """Fake the NetworkManagerState with connected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_CONNECTED_GLOBAL)
+        d = yield is_machine_connected()
+        self.assertTrue(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_nm_state_unknown(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_UNKNOWN)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_asleep_old(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_ASLEEP_OLD)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_asleep(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_ASLEEP)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_connecting_old(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_CONNECTING_OLD)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_connecting(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_CONNECTING)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_connected_local(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_CONNECTED_LOCAL)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_connected_site(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_CONNECTED_SITE)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_disconnected_old(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_DISCONNECTED_OLD)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_disconnected_nm_state_disconnected(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            NM_STATE_DISCONNECTED)
+        d = yield is_machine_connected()
+        self.assertFalse(d)
+
+    @inlineCallbacks
+    def test_is_machine_defer_error(self):
+        """Fake the NetworkManagerState with disconnected return."""
+        self.patch(FakeNetworkManagerState, "connection_state",
+            'no-int')
+        yield self.assertFailure(is_machine_connected(), NetworkFailException)
+
+
 class TestNmNotAvailableException(Exception):
 
     """An exception to test unavailability conditions."""

=== modified file 'ubuntu_sso/networkstate/tests/test_windows.py'
--- ubuntu_sso/networkstate/tests/test_windows.py	2011-11-08 15:06:00 +0000
+++ ubuntu_sso/networkstate/tests/test_windows.py	2012-01-04 16:53:28 +0000
@@ -16,8 +16,15 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for the network manager."""
+
+from ctypes import windll
 from mocker import MockerTestCase
+from twisted.internet.defer import inlineCallbacks
+
+from ubuntu_sso.tests import TestCase
+from ubuntu_sso.networkstate import NetworkFailException
 from ubuntu_sso.networkstate.windows import (
+    is_machine_connected,
     NetworkManager,
     NetworkManagerState,
     ONLINE,
@@ -117,3 +124,60 @@
         self.mocker.replay()
         self.state.find_online_state(listener=self.network_manager,
                                      listener_thread=self.thread)
+
+
+class FakeWininet(object):
+
+    """Fake wininet for windll."""
+
+    connection_state = -1
+
+    # pylint: disable=C0103
+    def InternetGetConnectedState(self, *args, **kwargs):
+        """Fake InternetGetConnectedState function from wininet."""
+        return self.connection_state
+    # pylint: enable=C0103
+
+
+class FakeWininetException(object):
+
+    """Fake wininet for windll."""
+
+    connection_state = -1
+
+    # pylint: disable=C0103
+    def InternetGetConnectedState(self, *args, **kwargs):
+        """Fake InternetGetConnectedState function from wininet."""
+        raise Exception()
+    # pylint: enable=C0103
+
+
+class TestConnection(TestCase):
+
+    """Test the state of the connection."""
+
+    @inlineCallbacks
+    def setUp(self):
+        """Setup the mocker dbus object tree."""
+        yield super(TestConnection, self).setUp()
+        self.patch(windll, "wininet", FakeWininet())
+
+    @inlineCallbacks
+    def test_is_machine_connected_connected(self):
+        """Fake the NetworkManagerState."""
+        self.patch(FakeWininet, "connection_state", 1)
+        result = yield is_machine_connected()
+        self.assertTrue(result)
+
+    @inlineCallbacks
+    def test_is_machine_connected_disconnected(self):
+        """Fake the NetworkManagerState."""
+        self.patch(FakeWininet, "connection_state", 0)
+        result = yield is_machine_connected()
+        self.assertFalse(result)
+
+    @inlineCallbacks
+    def test_is_machine_connected_error(self):
+        """Fake the NetworkManagerState."""
+        self.patch(windll, "wininet", FakeWininetException())
+        yield self.assertFailure(is_machine_connected(), NetworkFailException)

=== modified file 'ubuntu_sso/networkstate/windows.py'
--- ubuntu_sso/networkstate/windows.py	2011-11-08 15:06:00 +0000
+++ ubuntu_sso/networkstate/windows.py	2012-01-04 16:53:28 +0000
@@ -26,11 +26,13 @@
 from ctypes.wintypes import DWORD
 from threading import Thread
 
+from twisted.internet import defer
 # pylint: disable=F0401
 from win32com.server.policy import DesignatedWrapPolicy
 from win32com.client import Dispatch
 # pylint: enable=F0401
 
+from ubuntu_sso.networkstate import NetworkFailException
 from ubuntu_sso.logger import setup_logging
 
 logger = setup_logging("ubuntu_sso.networkstate")
@@ -163,11 +165,17 @@
 
 
 def is_machine_connected():
-    """The state was retrieved from the Network Manager."""
-    wininet = windll.wininet
-    flags = DWORD()
-    connected = wininet.InternetGetConnectedState(byref(flags), None)
-    return connected == 1
+    """Return a deferred that when fired, returns if the machine is online."""
+    # pylint: disable=W0703, W0702
+    try:
+        wininet = windll.wininet
+        flags = DWORD()
+        connected = wininet.InternetGetConnectedState(byref(flags), None)
+        return defer.succeed(connected == 1)
+    except Exception, e:
+        logger.exception('is_machine_connected failed with:')
+        return defer.fail(NetworkFailException(e))
+    # pylint: enable=W0703, W0702
 
 
 class NetworkManagerState(object):

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-12-12 17:42:20 +0000
+++ ubuntu_sso/qt/controllers.py	2012-01-04 16:53:28 +0000
@@ -164,13 +164,13 @@
         """Set the next id and fire signal."""
         logger.debug('ChooseSignInController._set_next_existing')
         self.view.next = self.view.wizard().current_user_page_id
-        self.view.wizard().next()
+        self.view.check_connection()
 
     def _set_next_new(self):
         """Set the next id and fire signal."""
         logger.debug('ChooseSignInController._set_next_new')
         self.view.next = self.view.wizard().setup_account_page_id
-        self.view.wizard().next()
+        self.view.check_connection()
 
 
 class CurrentUserController(BackendController):

=== modified file 'ubuntu_sso/qt/tests/test_controllers.py'
--- ubuntu_sso/qt/tests/test_controllers.py	2011-12-01 12:13:42 +0000
+++ ubuntu_sso/qt/tests/test_controllers.py	2012-01-04 16:53:28 +0000
@@ -201,6 +201,10 @@
         self.existing_account_button = FakeButton()
         self.setup_account_button = FakeButton()
 
+    def check_connection(self):
+        """Fake Check Connection."""
+        self.properties['check_connection'] = True
+
 
 class FakeCurrentUserView(FakeGenericView):
 
@@ -759,16 +763,15 @@
     def test_set_next_existing(self):
         """Test the execution of the callback."""
         self.controller._set_next_existing()
-        self.assertTrue(self.view.properties['wizard_next'])
         self.assertEqual(self.view.next,
             self.view.fake_wizard.current_user_page_id)
 
     def test_set_next_new(self):
         """Test the execution of the callback."""
         self.controller._set_next_new()
-        self.assertTrue(self.view.properties['wizard_next'])
         self.assertEqual(self.view.next,
             self.view.fake_wizard.setup_account_page_id)
+        self.assertTrue(self.view.properties.get('check_connection', False))
 
 
 class CurrentUserControllerTestCase(BaseTestCase):