Merge lp:~alecu/ubuntuone-client/make-it-stop into lp:ubuntuone-client

[Alejandro J. Cura]

Set the NetworkManager thread to be a daemon thread (LP: #839638)

Set the NetworkManager thread to be a daemon thread (LP: #839638)

[Diego Sarmentero (diegosarmentero)]

+1!

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'tests/platform/windows/test_ipc.py'
--- tests/platform/windows/test_ipc.py	2011-09-02 15:01:10 +0000
+++ tests/platform/windows/test_ipc.py	2011-09-06 18:52:58 +0000
@@ -3495,6 +3495,11 @@
         token = self.ipc.main.event_q.pushed_events[0][1]["access_token"]
         self.assertEqual(token, expected_token)
 
+    def test_daemonized(self):
+        """Check that the NM thread won't block the process."""
+        self.assertTrue(self.ipc.network_manager_thread.daemon)
+
+
 class IPCInterfaceEmptyCredentialsTestCase(IPCInterfaceTestCaseBase):
     """Tests for the IPCInterface with empty credentials."""
 

=== modified file 'ubuntuone/platform/windows/ipc.py'
--- ubuntuone/platform/windows/ipc.py	2011-09-02 14:48:35 +0000
+++ ubuntuone/platform/windows/ipc.py	2011-09-06 18:52:58 +0000
@@ -1076,6 +1076,7 @@
                                     disconnected_cb=self.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()
 
         self.oauth_credentials = None