Merge lp:~diegosarmentero/ubuntuone-client/network-detect into lp:ubuntuone-client

[Diego Sarmentero]

- The current network manager is now calling network_connected properly (LP: #885292).

To test it IRL you can execute syncdaemon, and you can see the logs for online/offline if you connect and disconnect the computer.

[Natalia Bidart (nataliabidart)]

I can not branch this branch, I'm getting:

nessita@dali:~/canonical/client$ bzr branch lp:~diegosarmentero/ubuntuone-client/network-detect
bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~diegosarmentero/ubuntuone-client/network-detect/": location is a repository.
nessita@dali:~/canonical/client$

Also, this MP is empty, so... can you please check what happened?
Thanks!

review: Needs Fixing

[Manuel de la Peña (mandel)]

I'm getting the following when I run the tests on windows:

C:\Users\Mandel\Projects\Canonical\ubuntu-sso-client\gtk-ui-executable>run-tests

Checking if python 2.7 is in the system
ERROR: The system was unable to find the specified registry key or value.
Checking if python 2.6 is in the system
ERROR: The system was unable to find the specified registry key or value.
Checking if python 2.7 32 is in the system
Python found, building auto-generated modules...
running build
Compiled data\qt\choose_sign_in.ui into ubuntu_sso\qt\choose_sign_in_ui.py
Compiled data\qt\current_user_sign_in.ui into ubuntu_sso\qt\current_user_sign_in
_ui.py
Compiled data\qt\email_verification.ui into ubuntu_sso\qt\email_verification_ui.
py
Compiled data\qt\error_message.ui into ubuntu_sso\qt\error_message_ui.py
Compiled data\qt\forgotten_password.ui into ubuntu_sso\qt\forgotten_password_ui.
py
Compiled data\qt\reset_password.ui into ubuntu_sso\qt\reset_password_ui.py
Compiled data\qt\setup_account.ui into ubuntu_sso\qt\setup_account_ui.py
Compiled data\qt\success_message.ui into ubuntu_sso\qt\success_message_ui.py
running build_py
creating build
creating build\lib
creating build\lib\ubuntu_sso
copying ubuntu_sso\account.py -> build\lib\ubuntu_sso
copying ubuntu_sso\credentials.py -> build\lib\ubuntu_sso
copying ubuntu_sso\logger.py -> build\lib\ubuntu_sso
copying ubuntu_sso\__init__.py -> build\lib\ubuntu_sso
creating build\lib\ubuntu_sso\utils
copying ubuntu_sso\utils\ipc.py -> build\lib\ubuntu_sso\utils
copying ubuntu_sso\utils\tcpactivation.py -> build\lib\ubuntu_sso\utils
copying ubuntu_sso\utils\txsecrets.py -> build\lib\ubuntu_sso\utils
copying ubuntu_sso\utils\ui.py -> build\lib\ubuntu_sso\utils
copying ubuntu_sso\utils\__init__.py -> build\lib\ubuntu_sso\utils
creating build\lib\ubuntu_sso\keyring
copying ubuntu_sso\keyring\linux.py -> build\lib\ubuntu_sso\keyring
copying ubuntu_sso\keyring\windows.py -> build\lib\ubuntu_sso\keyring
copying ubuntu_sso\keyring\__init__.py -> build\lib\ubuntu_sso\keyring
creating build\lib\ubuntu_sso\networkstate
copying ubuntu_sso\networkstate\linux.py -> build\lib\ubuntu_sso\networkstate
copying ubuntu_sso\networkstate\windows.py -> build\lib\ubuntu_sso\networkstate
copying ubuntu_sso\networkstate\__init__.py -> build\lib\ubuntu_sso\networkstate

creating build\lib\ubuntu_sso\main
copying ubuntu_sso\main\linux.py -> build\lib\ubuntu_sso\main
copying ubuntu_sso\main\windows.py -> build\lib\ubuntu_sso\main
copying ubuntu_sso\main\__init__.py -> build\lib\ubuntu_sso\main
creating build\lib\ubuntu_sso\gtk
copying ubuntu_sso\gtk\gui.py -> build\lib\ubuntu_sso\gtk
copying ubuntu_sso\gtk\main.py -> build\lib\ubuntu_sso\gtk
copying ubuntu_sso\gtk\__init__.py -> build\lib\ubuntu_sso\gtk
creating build\lib\ubuntu_sso\qt
copying ubuntu_sso\qt\choose_sign_in_ui.py -> build\lib\ubuntu_sso\qt
copying ubuntu_sso\qt\common.py -> build\lib\ubuntu_sso\qt
copying ubuntu_sso\qt\controllers.py -> build\lib\ubuntu_sso\qt
copying ubuntu_sso\qt\current_user_sign_in_ui.py -> build\lib\ubuntu_sso\qt
copying ubuntu_sso\qt\email_verification_ui.py -> build\lib\ubuntu_sso\qt
copying ubuntu_sso\qt\error_message_ui.py -> build\lib\ubuntu_sso\qt
copying ubun...

review: Needs Fixing

[Manuel de la Peña (mandel)]

Ag, sorry wrong branch :(

[Natalia Bidart (nataliabidart)]

* This import:

from ubuntu_sso.networkstate import ONLINE

has to be in the same group as:

from twisted.internet import defer
from ubuntuone.devtools.handlers import MementoHandler

Same for from ubuntu_sso.networkstate import NetworkManagerState.

* "# This imports needs to be here in order to belongs to this namespace" -> "# These imports needs to be here in order to belongs to this namespace"

* Since now NetworkManagerState is multiplatform, you should move it to intercation_interfaces. So, remove the instance of NetworkManagerState in each windows/linux implementation, and add it to SyncdaemonService class, right after the send_events var is assigned.

review: Needs Fixing

[Manuel de la Peña (mandel)]

This is for this branch:

C:\Users\Mandel\Projects\Canonical\ubuntuone-client\network-detect>run-tests.bat
 >> test.out
ERROR: The system was unable to find the specified registry key or value.
ERROR: The system was unable to find the specified registry key or value.
Traceback (most recent call last):
  File "C:\Python27\\Scripts\u1trial", line 325, in <module>
    main()
  File "C:\Python27\\Scripts\u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "C:\Python27\\Scripts\u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "C:\Python27\\Scripts\u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "C:\Python27\\Scripts\u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "C:\Users\Mandel\Projects\Canonical\ubuntuone-client\network-detect\tests
\platform\windows\test_network_manager.py", line 23, in <module>
    from ubuntuone.platform.windows.network_manager import NetworkManager
ImportError: No module named network_manager

That is when trying to run the tests on Windows.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Also, when trying to run tests on windows I'm getting:

  File "E:\client\review_network-detect\tests\platform\windows\test_network_mana
ger.py", line 23, in <module>
    from ubuntuone.platform.windows.network_manager import NetworkManager
ImportError: No module named network_manager

[lp:~diegosarmentero/ubuntuone-client/network-detect]

1180. By Diego Sarmentero on 2012-01-18

Merge.
Move Network Manager State to interaction interfaces.

1181. By Diego Sarmentero on 2012-01-18

removed test network manager file.

[Manuel de la Peña (mandel)]

All tests passed on Linux P and Windows.

review: Approve

[Natalia Bidart (nataliabidart)]

Can you please also remove this bit from ubuntuone/platform/linux/dbus_interface.py?

        # remove the NM's StateChanged signal receiver
        self.system_bus.remove_signal_receiver(self.connection_state_changed,
                               signal_name='StateChanged',
                               dbus_interface='org.freedesktop.NetworkManager',
                               path='/org/freedesktop/NetworkManager')

The rest looks good, works OK on linux, and I'm setting up my windows VM to test it IRL there.

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

> Can you please also remove this bit from
> ubuntuone/platform/linux/dbus_interface.py?
>
> # remove the NM's StateChanged signal receiver
> self.system_bus.remove_signal_receiver(self.connection_state_changed,
> signal_name='StateChanged',
> dbus_interface='org.freedesktop.NetworkManager',
> path='/org/freedesktop/NetworkManager')
>
> The rest looks good, works OK on linux, and I'm setting up my windows VM to
> test it IRL there.

Done!

[lp:~diegosarmentero/ubuntuone-client/network-detect]

1182. By Diego Sarmentero on 2012-01-27

merge

1183. By Diego Sarmentero on 2012-01-27

merge

1184. By Diego Sarmentero on 2012-02-06

Removing dbus code for network detect.

[Natalia Bidart (nataliabidart)]

Hum, I did not notice this before, but there are still some NM code:

nessita@dali:~/canonical/client/review_network-detect$ grep NetworkManager *
contrib/dbus-docs:36: FakeNetworkManager,
contrib/dbus-docs:171: nm = FakeNetworkManager(bus)
tests/syncdaemon/test_action_queue.py:1386: expected = ['SYS_NET_CONNECTED', # from the DBus fake NetworkManager
tests/platform/linux/test_dbus.py:48:class FakeNetworkManager(DBusExposedObject):
tests/platform/linux/test_dbus.py:49: """ A fake NetworkManager that only emits StatusChanged signal. """
tests/platform/linux/test_dbus.py:52: path = '/org/freedesktop/NetworkManager'
tests/platform/linux/test_dbus.py:57: self.bus.request_name('org.freedesktop.NetworkManager',
tests/platform/linux/test_dbus.py:61: self.busName = dbus.service.BusName('org.freedesktop.NetworkManager',
tests/platform/linux/test_dbus.py:67: """ Shutdown the fake NetworkManager """
tests/platform/linux/test_dbus.py:73: @dbus.service.signal('org.freedesktop.NetworkManager', signature='i')
tests/platform/linux/test_dbus.py:95: @dbus.service.method('org.freedesktop.NetworkManager')
tests/platform/linux/test_dbus.py:121: self.nm = FakeNetworkManager(self.bus)
tests/platform/linux/test_dbus.py:211:class NetworkManagerIntegrationTests(IPCTestCase):
tests/platform/linux/test_dbus.py:212: """Test case for our NetworkManager integration."""
ubuntuone/platform/linux/dbus_interface.py:44:# NetworkManager State constants
ubuntuone/platform/linux/dbus_interface.py:864: logger.error("Error while getting the NetworkManager state %s",
ubuntuone/platform/linux/dbus_interface.py:866: # If we get an error back from NetworkManager, we should
ubuntuone/platform/linux/dbus_interface.py:868: # NetworkManager is down or broken or something.

Can you also remove those?

[lp:~diegosarmentero/ubuntuone-client/network-detect]

1185. By Diego Sarmentero on 2012-02-07

merge

1186. By Diego Sarmentero on 2012-02-07

run-tests.bat reverted

1187. By Diego Sarmentero on 2012-02-10

Remove some references to NetworkManager

[Natalia Bidart (nataliabidart)]

Looks good. Still we have a FakedNetworkManager in test_dbus, so I filled bug #935389 so we can land this branch.

Tested IRL, works as expected!

review: Approve

=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-11-30 19:30:00 +0000
+++ tests/platform/linux/test_dbus.py	2012-02-10 13:42:19 +0000
@@ -39,8 +39,8 @@
     DBUS_IFACE_FOLDERS_NAME,
     DBUS_IFACE_PUBLIC_FILES_NAME,
     DBUS_IFACE_LAUNCHER_NAME,
-    NM_STATE_CONNECTED_GLOBAL,
-    NM_STATE_DISCONNECTED,
+#    NM_STATE_CONNECTED_GLOBAL,
+#    NM_STATE_DISCONNECTED,
 )
 from ubuntuone.platform.tools.linux import DBusClient
 
@@ -76,11 +76,11 @@
 
     def emit_connected(self):
         """ Emits the signal StateCganged(3). """
-        self.StateChanged(NM_STATE_CONNECTED_GLOBAL)
+        self.StateChanged(70)
 
     def emit_disconnected(self):
         """ Emits the signal StateCganged(4). """
-        self.StateChanged(NM_STATE_DISCONNECTED)
+        self.StateChanged(20)
 
     @dbus.service.method(dbus.PROPERTIES_IFACE,
                          in_signature='ss', out_signature='v',
@@ -95,7 +95,7 @@
     @dbus.service.method('org.freedesktop.NetworkManager')
     def state(self):
         """Fake the state."""
-        return NM_STATE_CONNECTED_GLOBAL
+        return 70
 
     # pylint: enable-msg=C0103
 
@@ -208,40 +208,6 @@
 DBusTwistedTestCase = IPCTestCase  # API compatibility
 
 
-class NetworkManagerIntegrationTests(IPCTestCase):
-    """Test case for our NetworkManager integration."""
-
-    def test_nm_signals(self):
-        """Test that NM signals are received and handled properly."""
-        result = None
-        d = defer.Deferred()
-
-        class Listener(object):
-            """Helper class."""
-
-            # class-closure, cannot use self, pylint: disable=E0213
-            def handle_SYS_NET_CONNECTED(innerself):
-                self.nm.emit_disconnected()
-
-            def handle_SYS_NET_DISCONNECTED(innerself):
-                self.assertTrue(result)
-
-        listener = Listener()
-        self.event_q.subscribe(listener)
-
-        def empty_queue_cb():
-            d.callback(True)
-
-        def callback(result):
-            self.event_q.unsubscribe(listener)
-            self.event_q.remove_empty_event_queue_callback(empty_queue_cb)
-        d.addCallback(callback)
-
-        self.nm.emit_connected()
-        self.event_q.add_empty_event_queue_callback(empty_queue_cb)
-        return d
-
-
 class StatusTestCase(IPCTestCase):
     """Tests for the Status exposed object."""
 

=== modified file 'tests/platform/windows/test_ipc.py'
--- tests/platform/windows/test_ipc.py	2011-10-28 19:17:47 +0000
+++ tests/platform/windows/test_ipc.py	2012-02-10 13:42:19 +0000
@@ -652,10 +652,6 @@
                             'Remote object should not be None')
         self.assertIsInstance(remote, RemoteReference)
 
-    def test_daemonized(self):
-        """Check that the NM thread won't block the process."""
-        self.assertTrue(self.interface.network_manager_thread.daemon)
-
 
 class IPCPortTestCase(TestCase):
     """Tests for the ipc port setup."""

=== removed file 'tests/platform/windows/test_network_manager.py'
--- tests/platform/windows/test_network_manager.py	2011-10-28 18:43:23 +0000
+++ tests/platform/windows/test_network_manager.py	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author: Manuel de la Pena<[e-mail]>
-#
-# Copyright 2011 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/>.
-
-"""Tests for the network manager."""
-
-from mocker import MockerTestCase
-
-from ubuntuone.platform.windows.network_manager import NetworkManager
-
-
-class TestNetworkManager(MockerTestCase):
-    """Test he Network Manager."""
-
-    def setUp(self):
-        super(TestNetworkManager, self).setUp()
-        self.connection_info = self.mocker.mock()
-        self.connection_no_info = self.mocker.mock()
-        self.disconnected = self.mocker.mock()
-        self.manager = NetworkManager(self.connection_no_info,
-                                      self.connection_info, self.disconnected)
-
-    def test_connection_made(self):
-        """Ensure db is called."""
-        self.connection_info()
-        self.mocker.replay()
-        self.manager.ConnectionMade()
-
-    def test_connection_made_no_cb(self):
-        """Ensure db is called."""
-        self.manager.connected_cb_info = None
-        self.mocker.replay()
-        self.manager.ConnectionMade()
-
-    def test_connection_made_no_info(self):
-        """Ensure db is called."""
-        self.connection_no_info()
-        self.mocker.replay()
-        self.manager.ConnectionMadeNoQOCInfo()
-
-    def test_connection_made_no_info_no_cb(self):
-        """Ensure db is called."""
-        self.manager.connected_cb = None
-        self.mocker.replay()
-        self.manager.ConnectionMadeNoQOCInfo()
-
-    def test_disconnection(self):
-        """Ensure db is called."""
-        self.disconnected()
-        self.mocker.replay()
-        self.manager.ConnectionLost()
-
-    def test_disconnection_no_cb(self):
-        """Ensure db is called."""
-        self.manager.disconnected_cb = None
-        self.mocker.replay()
-        self.manager.ConnectionLost()

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2012-02-06 15:32:28 +0000
+++ tests/syncdaemon/test_action_queue.py	2012-02-10 13:42:19 +0000
@@ -58,7 +58,7 @@
     protocol_pb2,
     request,
 )
-from ubuntuone.syncdaemon import states, interfaces, config
+from ubuntuone.syncdaemon import interfaces, config
 from ubuntuone.syncdaemon import action_queue
 from ubuntuone.syncdaemon.action_queue import (
     ActionQueue, ActionQueueCommand, ChangePublicAccess, CreateUDF,
@@ -1295,109 +1295,6 @@
                                                 "host 1.2.3.4", "port 4321"))
 
 
-class NetworkmanagerTestCase(FactoryBaseTestCase):
-    """Base test case generating a connected factory."""
-
-    timeout = 15
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        """Init."""
-        yield super(NetworkmanagerTestCase, self).setUp()
-        self.action_queue.event_queue.push('SYS_NET_CONNECTED')
-        self.main.start()
-
-    @defer.inlineCallbacks
-    def test_wrong_disconnect(self):
-        """Test factory's connection when SYS_NET_DISCONNECTED."""
-
-        d1 = self.main.wait_for('SYS_CONNECTION_MADE')
-        d2 = self.main.wait_for('SYS_CONNECTION_LOST')
-
-        self.server = self._start_sample_webserver()
-        self.user_connect()
-        yield d1
-
-        self.action_queue.event_queue.push('SYS_NET_DISCONNECTED')
-        yield d2
-
-    @defer.inlineCallbacks
-    def test_disconnect_twice(self):
-        """Test connection when SYS_NET_DISCONNECTED is received twice."""
-
-        d1 = self.main.wait_for('SYS_CONNECTION_MADE')
-        d2 = self.main.wait_for('SYS_CONNECTION_LOST')
-
-        self.server = self._start_sample_webserver()
-        self.user_connect()
-        yield d1
-
-        self.action_queue.event_queue.push('SYS_NET_DISCONNECTED')
-        yield d2
-
-        self.action_queue.event_queue.events = []
-        self.action_queue.event_queue.push('SYS_NET_DISCONNECTED')
-        self.assertEqual([('SYS_NET_DISCONNECTED', {})],
-                         self.action_queue.event_queue.events,
-                        'No new events after a misplaced SYS_NET_DISCONNECTED')
-
-    @defer.inlineCallbacks
-    def test_net_connected_if_already_connected(self):
-        """Test connection when SYS_NET_CONNECTED is received twice."""
-
-        d1 = self.main.wait_for('SYS_CONNECTION_MADE')
-
-        self.server = self._start_sample_webserver()
-        self.user_connect()
-        yield d1
-
-        self.action_queue.event_queue.events = []
-        self.action_queue.event_queue.push('SYS_NET_CONNECTED')
-        self.assertEqual([('SYS_NET_CONNECTED', {})],
-                         self.action_queue.event_queue.events,
-                         'No new events after a misplaced SYS_NET_CONNECTED')
-
-    @defer.inlineCallbacks
-    def test_messy_mix(self):
-        """Test connection when a messy mix of events is received."""
-        orig_waiting = states.MAX_WAITING
-        states.MAX_WAITING = 1
-
-        self.action_queue.event_queue.events = []
-        self.server = self._start_sample_webserver()
-
-        conn_made = self.main.wait_for('SYS_CONNECTION_MADE')
-        self.user_connect()
-        yield conn_made
-
-        events = ['SYS_NET_CONNECTED', 'SYS_NET_DISCONNECTED',
-                  'SYS_NET_CONNECTED', 'SYS_NET_CONNECTED',
-                  'SYS_NET_DISCONNECTED', 'SYS_NET_DISCONNECTED',
-                  'SYS_NET_CONNECTED']
-
-        for i in events:
-            self.action_queue.event_queue.push(i)
-
-        yield self.main.wait_for_nirvana()
-
-        expected = ['SYS_NET_CONNECTED', # from the DBus fake NetworkManager
-                    'SYS_NET_CONNECTED', 'SYS_NET_DISCONNECTED',
-                    'SYS_CONNECTION_LOST', 'SYS_CONNECTION_RETRY',
-                    'SYS_NET_CONNECTED', 'SYS_NET_CONNECTED',
-                    'SYS_CONNECTION_MADE', 'SYS_NET_DISCONNECTED',
-                    'SYS_NET_DISCONNECTED']
-
-        avoid = ('SYS_STATE_CHANGED', 'SYS_LOCAL_RESCAN_DONE',
-                 'SYS_PROTOCOL_VERSION_OK', 'SYS_SET_CAPABILITIES_OK',
-                 'SYS_AUTH_OK', 'SYS_SERVER_RESCAN_DONE')
-        actual = [event for (event, kwargs) in
-                  self.action_queue.event_queue.events
-                  if event not in avoid]
-        self.assertEqual(sorted(expected), sorted(actual))
-
-        states.MAX_WAITING = orig_waiting
-
-
 class ConnectedBaseTestCase(FactoryBaseTestCase):
     """Base test case generating a connected factory."""
 

=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
--- tests/syncdaemon/test_interaction_interfaces.py	2012-01-17 20:00:44 +0000
+++ tests/syncdaemon/test_interaction_interfaces.py	2012-02-10 13:42:19 +0000
@@ -21,6 +21,7 @@
 
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntu_sso.networkstate import ONLINE
 
 from contrib.testing.testcase import (
     FakeCommand,
@@ -2208,7 +2209,21 @@
     def test_rescan_from_scratch_missing_volume(self):
         """Test for rescan_from_scratch with a non-existing volume."""
         volume_id = object()
-        self.assertRaises(ValueError, self.sd_obj.rescan_from_scratch, volume_id)
+        self.assertRaises(ValueError,
+            self.sd_obj.rescan_from_scratch, volume_id)
+
+    def test_network_state_changed_with_connection(self):
+        """Test the network_state changed method with a connection."""
+        self.sd_obj.network_state_changed(ONLINE)
+
+        self.assertEqual(self.events, [('SYS_NET_CONNECTED', {})])
+
+    def test_network_state_changed_without_connection(self):
+        """Test the network_state changed method without a connection."""
+        # Sending anything instead of ONLINE should be interpreted as OFFLINE
+        self.sd_obj.network_state_changed(object())
+
+        self.assertEqual(self.events, [('SYS_NET_DISCONNECTED', {})])
 
     def test_network_connected(self):
         """Test the network_connected method."""

=== modified file 'tests/syncdaemon/test_states.py'
--- tests/syncdaemon/test_states.py	2011-10-27 11:39:43 +0000
+++ tests/syncdaemon/test_states.py	2012-02-10 13:42:19 +0000
@@ -847,58 +847,6 @@
             self.assertFalse(self.aq.queue.active)
 
 
-class TestStateManagerPassToNetworkManager(Base):
-    """All network events should go to NetworkManager."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(TestStateManagerPassToNetworkManager,
-                    self).setUp()
-
-        # put a function in the middle to log calls
-        self.called_events = []
-        orig_on_event = self.sm.connection.on_event
-        def fake_on_event(event):
-            """Log the call and call original."""
-            self.called_events.append(event)
-            orig_on_event(event)
-        self.sm.connection.on_event = fake_on_event
-
-    def _test(self, event):
-        """Generic test method."""
-        cnt = 0
-        for node in self.sm_nodes_ok:
-            cnt += 1
-            self.sm.state = node
-            self.sm.handle_default(event)
-            self.assertEqual(self.called_events, [event]*cnt)
-
-    def test_net_connected(self):
-        """SYS_NET_CONNECTED should go to Connection no matter where."""
-        self._test('SYS_NET_CONNECTED')
-
-    def test_user_connect(self):
-        """SYS_USER_CONNECT should go to Connection no matter where."""
-        self._test('SYS_USER_CONNECT')
-
-    def test_net_disconnected(self):
-        """SYS_NET_DISCONNECTED should go to Connection no matter where."""
-        self._test('SYS_NET_DISCONNECTED')
-
-    def test_user_disconnect(self):
-        """SYS_USER_DISCONNECT should go to Connection no matter where."""
-        self._test('SYS_USER_DISCONNECT')
-
-    def test_connection_lost(self):
-        """SYS_CONNECTION_LOST should go to Connection no matter where."""
-        self._test('SYS_CONNECTION_LOST')
-
-    def test_handshake_timeout(self):
-        """SYS_HANDSHAKE_TIMEOUT should go to Connection no matter where."""
-        self._test('SYS_HANDSHAKE_TIMEOUT')
-
-
-
 class TestStateManagerPassToQueueManager(Base):
     """All queue events should go to QueueManager."""
 

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2012-01-25 20:49:55 +0000
+++ ubuntuone/platform/__init__.py	2012-02-10 13:42:19 +0000
@@ -31,6 +31,7 @@
     from ubuntuone.platform import linux
     source = linux
 
+# This imports needs to be here in order to belongs to this namespace
 from ubuntuone.platform import credentials
 from ubuntuone.platform import tools
 

=== modified file 'ubuntuone/platform/linux/dbus_interface.py'
--- ubuntuone/platform/linux/dbus_interface.py	2012-01-02 20:24:31 +0000
+++ ubuntuone/platform/linux/dbus_interface.py	2012-02-10 13:42:19 +0000
@@ -41,28 +41,6 @@
 DBUS_IFACE_PUBLIC_FILES_NAME = DBUS_IFACE_NAME + '.PublicFiles'
 DBUS_IFACE_LAUNCHER_NAME = DBUS_IFACE_NAME + '.Launcher'
 
-# NetworkManager State constants
-NM_STATE_UNKNOWN = 0
-NM_STATE_ASLEEP_OLD = 1
-NM_STATE_ASLEEP = 10
-NM_STATE_CONNECTING_OLD = 2
-NM_STATE_CONNECTING = 40
-NM_STATE_CONNECTED_OLD = 3
-NM_STATE_CONNECTED_LOCAL = 50
-NM_STATE_CONNECTED_SITE = 60
-NM_STATE_CONNECTED_GLOBAL = 70
-NM_STATE_DISCONNECTED_OLD = 4
-NM_STATE_DISCONNECTED = 20
-
-# NM state -> online/offline mapping
-# Note that the LOCAL and SITE mappings are *not* a typo.  Local and site links
-# are not enough to connect to one.ubuntu.com, so we treat them as if we were
-# not connected.
-NM_STATE_ONLINE_EVENTS = [
-    NM_STATE_CONNECTED_OLD,
-    NM_STATE_CONNECTED_GLOBAL,
-]
-
 logger = logging.getLogger("ubuntuone.SyncDaemon.DBus")
 
 
@@ -859,39 +837,6 @@
         self.config = Config(self.busName, service)
         self.service = service
 
-        def error_handler(error):
-            """Handle errors from NM."""
-            logger.error("Error while getting the NetworkManager state %s",
-                         error)
-            # If we get an error back from NetworkManager, we should
-            # just try to connect anyway; it probably means that
-            # NetworkManager is down or broken or something.
-            self.connection_state_changed(NM_STATE_CONNECTED_GLOBAL)
-        try:
-            nm = self.system_bus.get_object(
-                'org.freedesktop.NetworkManager',
-                '/org/freedesktop/NetworkManager',
-                follow_name_owner_changes=True)
-            iface = dbus.Interface(nm, 'org.freedesktop.NetworkManager')
-        except dbus.DBusException, e:
-            if e.get_dbus_name() == \
-                'org.freedesktop.DBus.Error.ServiceUnknown':
-                # NetworkManager isn't running.
-                logger.warn("Unable to connect to NetworkManager. "
-                              "Assuming we have network.")
-                self.connection_state_changed(NM_STATE_CONNECTED_GLOBAL)
-            else:
-                raise
-        else:
-            iface.state(reply_handler=self.connection_state_changed,
-                        error_handler=error_handler)
-
-        # register a handler to NM StateChanged signal
-        self.system_bus.add_signal_receiver(self.connection_state_changed,
-                               signal_name='StateChanged',
-                               dbus_interface='org.freedesktop.NetworkManager',
-                               path='/org/freedesktop/NetworkManager')
-
         logger.info('DBusInterface initialized.')
 
     def shutdown(self, with_restart=False):
@@ -905,11 +850,6 @@
         self.config.remove_from_connection()
         self.folders.remove_from_connection()
         self.launcher.remove_from_connection()
-        # remove the NM's StateChanged signal receiver
-        self.system_bus.remove_signal_receiver(self.connection_state_changed,
-                               signal_name='StateChanged',
-                               dbus_interface='org.freedesktop.NetworkManager',
-                               path='/org/freedesktop/NetworkManager')
         self.bus.release_name(self.busName.get_name())
         if with_restart:
             # this is what activate_name_owner boils down to, except that
@@ -931,10 +871,3 @@
         not: there is nothing we can do about it.
         """
     _restart_error_handler = _restart_reply_handler
-
-    def connection_state_changed(self, state):
-        """Push a connection state changed event to the Event Queue."""
-        if state in NM_STATE_ONLINE_EVENTS:
-            self.service.network_connected()
-        else:
-            self.service.network_disconnected()

=== modified file 'ubuntuone/platform/windows/ipc.py'
--- ubuntuone/platform/windows/ipc.py	2012-01-03 12:40:04 +0000
+++ ubuntuone/platform/windows/ipc.py	2012-02-10 13:42:19 +0000
@@ -21,7 +21,6 @@
 
 from functools import wraps
 from collections import defaultdict
-from threading import Thread
 
 from twisted.internet import defer, reactor
 from twisted.spread.pb import (
@@ -38,7 +37,6 @@
     ActivationInstance,
     AlreadyStartedError,
 )
-from ubuntuone.platform.windows.network_manager import NetworkManager
 
 logger = logging.getLogger("ubuntuone.SyncDaemon.Pb")
 LOCALHOST = "127.0.0.1"
@@ -933,19 +931,6 @@
         self.factory = PBServerFactory(self)
         self.listener = ipc_server_listen(self.factory)
 
-        # register to future network changes
-        self.network_manager = NetworkManager(
-                                connected_cb=service.network_connected,
-                                disconnected_cb=service.network_disconnected)
-        self.network_manager_thread = Thread(
-            target=self.network_manager.register, name='Network changes')
-        self.network_manager_thread.daemon = True
-        self.network_manager_thread.start()
-
-        # XXX: the current network manager is not calling network_connected
-        # for now, let's fake it
-        service.network_connected()
-
         logger.info('IPC initialized.')
 
     def shutdown(self, with_restart=False):

=== removed file 'ubuntuone/platform/windows/network_manager.py'
--- ubuntuone/platform/windows/network_manager.py	2011-10-14 20:02:23 +0000
+++ ubuntuone/platform/windows/network_manager.py	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author: Manuel de la Pena<[e-mail]>
-#
-# Copyright 2011 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/>.
-"""Implementation of a Network Mnager using ISesNework in Python."""
-import logging
-
-import pythoncom
-
-from win32com.server.policy import DesignatedWrapPolicy
-from win32com.client import Dispatch
-
-# set te logging to store the data in the ubuntuone folder
-logger = logging.getLogger('ubuntuone.platform.windows.NetworkManager')
-
-## from EventSys.h
-PROGID_EventSystem = "EventSystem.EventSystem"
-PROGID_EventSubscription = "EventSystem.EventSubscription"
-
-# SENS (System Event Notification Service) values for the events,
-# this events contain the uuid of the event, the name of the event to be used
-# as well as the method name of the method in the ISesNetwork interface that
-# will be executed for the event.
-# For more ingo look at:
-# http://msdn.microsoft.com/en-us/library/aa377384(v=vs.85).aspx
-
-SUBSCRIPTION_NETALIVE = ('{cd1dcbd6-a14d-4823-a0d2-8473afde360f}',
-                         'UbuntuOne Network Alive',
-                         'ConnectionMade')
-
-SUBSCRIPTION_NETALIVE_NOQOC = ('{a82f0e80-1305-400c-ba56-375ae04264a1}',
-                               'UbuntuOne Net Alive No Info',
-                               'ConnectionMadeNoQOCInfo')
-
-SUBSCRIPTION_NETLOST = ('{45233130-b6c3-44fb-a6af-487c47cee611}',
-                        'UbuntuOne Network Lost',
-                        'ConnectionLost')
-
-SUBSCRIPTION_REACH = ('{4c6b2afa-3235-4185-8558-57a7a922ac7b}',
-                       'UbuntuOne Network Reach',
-                       'ConnectionMade')
-
-SUBSCRIPTION_REACH_NOQOC = ('{db62fa23-4c3e-47a3-aef2-b843016177cf}',
-                            'UbuntuOne Network Reach No Info',
-                            'ConnectionMadeNoQOCInfo')
-
-SUBSCRIPTION_REACH_NOQOC2 = ('{d4d8097a-60c6-440d-a6da-918b619ae4b7}',
-                             'UbuntuOne Network Reach No Info 2',
-                             'ConnectionMadeNoQOCInfo')
-
-SUBSCRIPTIONS = [SUBSCRIPTION_NETALIVE,
-                 SUBSCRIPTION_NETALIVE_NOQOC,
-                 SUBSCRIPTION_NETLOST,
-                 SUBSCRIPTION_REACH,
-                 SUBSCRIPTION_REACH_NOQOC,
-                 SUBSCRIPTION_REACH_NOQOC2]
-
-SENSGUID_EVENTCLASS_NETWORK = '{d5978620-5b9f-11d1-8dd2-00aa004abd5e}'
-SENSGUID_PUBLISHER = "{5fee1bd6-5b9b-11d1-8dd2-00aa004abd5e}"
-
-# uuid of the implemented com interface
-IID_ISesNetwork = '{d597bab1-5b9f-11d1-8dd2-00aa004abd5e}'
-
-
-class NetworkManager(DesignatedWrapPolicy):
-    """Implement ISesNetwork to know about the network status."""
-
-    _com_interfaces_ = [IID_ISesNetwork]
-    _public_methods_ = ['ConnectionMade',
-                        'ConnectionMadeNoQOCInfo',
-                        'ConnectionLost']
-    _reg_clsid_ = '{41B032DA-86B5-4907-A7F7-958E59333010}'
-    _reg_progid_ = "UbuntuOne.NetworkManager"
-
-    def __init__(self, connected_cb=None, connected_cb_info=None,
-                 disconnected_cb=None):
-        self._wrap_(self)
-        self.connected_cb = connected_cb
-        self.connected_cb_info = connected_cb_info
-        self.disconnected_cb = disconnected_cb
-
-    def ConnectionMade(self, *args):
-        """Tell that the connection is up again."""
-        logger.info('Connection was made.')
-        if self.connected_cb_info:
-            self.connected_cb_info()
-
-    def ConnectionMadeNoQOCInfo(self, *args):
-        """Tell that the connection is up again."""
-        logger.info('Connection was made no info.')
-        if self.connected_cb:
-            self.connected_cb()
-
-    def ConnectionLost(self, *args):
-        """Tell the connection was lost."""
-        logger.info('Connection was lost.')
-        if self.disconnected_cb:
-            self.disconnected_cb()
-
-    def register(self):
-        """Register to listen to network events."""
-        # call the CoInitialize to allow the registration to run in an other
-        # thread
-        pythoncom.CoInitialize()
-        # interface to be used by com
-        manager_interface = pythoncom.WrapObject(self)
-        event_system = Dispatch(PROGID_EventSystem)
-        # register to listent to each of the events to make sure that
-        # the code will work on all platforms.
-        for current_event in SUBSCRIPTIONS:
-            # create an event subscription and add it to the event
-            # service
-            event_subscription = Dispatch(PROGID_EventSubscription)
-            event_subscription.EventClassId = SENSGUID_EVENTCLASS_NETWORK
-            event_subscription.PublisherID = SENSGUID_PUBLISHER
-            event_subscription.SubscriptionID = current_event[0]
-            event_subscription.SubscriptionName = current_event[1]
-            event_subscription.MethodName = current_event[2]
-            event_subscription.SubscriberInterface = manager_interface
-            event_subscription.PerUser = True
-            # store the event
-            try:
-                event_system.Store(PROGID_EventSubscription,
-                                   event_subscription)
-            except pythoncom.com_error as e:
-                logger.error(
-                    'Error registering %s to event %s', e, current_event[1])
-
-        pythoncom.PumpMessages()
-
-if __name__ == '__main__':
-    # Run an expample of the code so that the user can test the code in
-    # real life.
-    from threading import Thread
-
-    def connected():
-        print 'Connected'
-
-    def connected_info():
-        print 'Connected'
-
-    def disconnected():
-        print 'Disconnected'
-
-    manager = NetworkManager(connected, connected_info, disconnected)
-    p = Thread(target=manager.register)
-    p.start()

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2012-01-15 19:31:07 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2012-02-10 13:42:19 +0000
@@ -36,6 +36,8 @@
 
 from twisted.internet import defer
 
+from ubuntu_sso.networkstate import NetworkManagerState, ONLINE
+
 from ubuntuone.logger import log_call
 from ubuntuone.platform import credentials, ExternalInterface
 from ubuntuone.storageprotocol import request
@@ -1150,6 +1152,9 @@
         super(SyncdaemonService, self).__init__(main, interface)
 
         self.send_events = send_events
+        self.network_manager = NetworkManagerState(
+                                result_cb=self.network_state_changed)
+        self.network_manager.find_online_state()
 
         if interface is None:
             self.interface = ExternalInterface(service=self)
@@ -1283,6 +1288,14 @@
         self.main.action_q.rescan_from_scratch(volume.volume_id)
 
     @log_call(logger.debug)
+    def network_state_changed(self, state):
+        """Receive the connection state and call the proper function."""
+        if state == ONLINE:
+            self.network_connected()
+        else:
+            self.network_disconnected()
+
+    @log_call(logger.debug)
     def network_connected(self):
         """Push the connected event."""
         self.main.event_q.push('SYS_NET_CONNECTED')

=== modified file 'ubuntuone/syncdaemon/states.py'
--- ubuntuone/syncdaemon/states.py	2011-10-14 20:02:23 +0000
+++ ubuntuone/syncdaemon/states.py	2012-02-10 13:42:19 +0000
@@ -400,7 +400,7 @@
                 self._state_changed()
             return
 
-        # NetworkManager and User events
+        # User events
         if event in ('SYS_NET_CONNECTED', 'SYS_USER_CONNECT',
                      'SYS_NET_DISCONNECTED', 'SYS_USER_DISCONNECT',
                      'SYS_CONNECTION_LOST', 'SYS_HANDSHAKE_TIMEOUT'):