Merge lp:~alecu/ubuntu-sso-client/daemonize-networkstate-thread into lp:ubuntu-sso-client

[Alejandro J. Cura]

- Daemonize the network state thread under windows (LP: #963404).

- Daemonize the network state thread under windows (LP: #963404).

[Alejandro J. Cura (alecu)]

To review this branch: start a syncdaemon instance having this branch in PYTHONPATH, then make sure that the process exits when asking it to quit (for example, using u1sdtool -q).

[Natalia Bidart (nataliabidart)]

Looks good! And is pretty trivial.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntu-sso-client/daemonize-networkstate-thread into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.xdg_base_directory.tests.test_common
  TestBaseDirectory
    test_load_config_paths_filter ... [OK]
    test_save_config_path ... [OK]
    test_xdg_cache_home_is_utf8_bytes ... [OK]
    test_xdg_config_dirs_are_bytes ... [OK]
    test_xdg_config_home_is_utf8_bytes ... [OK]
    test_xdg_data_dirs_are_bytes ... [OK]
    test_xdg_data_home_is_utf8_bytes ... [OK]
    test_xdg_home_is_utf8_bytes ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_main
  BasicTestCase
    test_main ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_gui
  BasicTestCase
    runTest ... [OK]
  BasicUbuntuSSOClientTestCase
    test_app_name_is_stored ... [OK]
    test_cancel_buttons_close_window ... [OK]
    test_close_callback_if_not_set ... [OK]
    test_closing_main_window_calls_close_callback ... [OK]
    test_entries_activates_default ... [OK]
    test_finish_error_shows_error_page ... [OK]
    test_finish_success_shows_success_page ... [OK]
    test_initial_text_for_entries ... [OK]
    test_main_window_is_resizable ... [OK]
    test_main_window_is_visible_at_startup ... [OK]
    test_pages_are_packed_into_container ... [OK]
    test_password_fields_are_password ... [OK]
    test_signals_are_removed ... [OK]
    test_warning_fields_are_cleared ... [OK]
    test_window_icon ... [OK]
  DefaultButtonsTestCase
    test_default_widget_can_default ... [OK]
    test_pages_have_default_widget_set ... [OK]
    test_set_current_page_grabs_focus_for_default_button ... [OK]
  EnterDetailsTestCase
    test_captcha_filename_is_different_each_time ... [OK]
    test_captcha_id_is_stored_when_captcha_is_available ... [OK]
    test_captcha_image_is_a_spinner_at_first ... [OK]
    test_captcha_image_is_not_visible_at_startup ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntu-sso-client/daemonize-networkstate-thread into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.xdg_base_directory.tests.test_common
  TestBaseDirectory
    test_load_config_paths_filter ... [OK]
    test_save_config_path ... [OK]
    test_xdg_cache_home_is_utf8_bytes ... [OK]
    test_xdg_config_dirs_are_bytes ... [OK]
    test_xdg_config_home_is_utf8_bytes ... [OK]
    test_xdg_data_dirs_are_bytes ... [OK]
    test_xdg_data_home_is_utf8_bytes ... [OK]
    test_xdg_home_is_utf8_bytes ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_main
  BasicTestCase
    test_main ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_gui
  BasicTestCase
    runTest ... [OK]
  BasicUbuntuSSOClientTestCase
    test_app_name_is_stored ... [OK]
    test_cancel_buttons_close_window ... [OK]
    test_close_callback_if_not_set ... [OK]
    test_closing_main_window_calls_close_callback ... [OK]
    test_entries_activates_default ... [OK]
    test_finish_error_shows_error_page ... [OK]
    test_finish_success_shows_success_page ... [OK]
    test_initial_text_for_entries ... [OK]
    test_main_window_is_resizable ... [OK]
    test_main_window_is_visible_at_startup ... [OK]
    test_pages_are_packed_into_container ... [OK]
    test_password_fields_are_password ... [OK]
    test_signals_are_removed ... [OK]
    test_warning_fields_are_cleared ... [OK]
    test_window_icon ... [OK]
  DefaultButtonsTestCase
    test_default_widget_can_default ... [OK]
    test_pages_have_default_widget_set ... [OK]
    test_set_current_page_grabs_focus_for_default_button ... [OK]
  EnterDetailsTestCase
    test_captcha_filename_is_different_each_time ... [OK]
    test_captcha_id_is_stored_when_captcha_is_available ... [OK]
    test_captcha_image_is_a_spinner_at_first ... [OK]
    test_captcha_image_is_not_visible_at_startup ...

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntu_sso/networkstate/tests/test_windows.py'
--- ubuntu_sso/networkstate/tests/test_windows.py	2011-11-11 19:20:59 +0000
+++ ubuntu_sso/networkstate/tests/test_windows.py	2012-03-27 03:05:20 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Manuel de la Pena<[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -80,7 +78,7 @@
 
 
 class TestNetworkManagerState(MockerTestCase):
-    """Test he Network Manager State."""
+    """Test the Network Manager State."""
 
     def setUp(self):
         super(TestNetworkManagerState, self).setUp()
@@ -109,6 +107,7 @@
         self.mocker.result(False)
         self.cb(OFFLINE)
         self.mocker.result(self.thread)
+        self.thread.daemon = True
         self.thread.start()
         self.mocker.replay()
         self.state.find_online_state(listener=self.network_manager,
@@ -120,6 +119,7 @@
         self.mocker.result(ONLINE)
         self.cb(ONLINE)
         self.mocker.result(self.thread)
+        self.thread.daemon = True
         self.thread.start()
         self.mocker.replay()
         self.state.find_online_state(listener=self.network_manager,
@@ -127,7 +127,6 @@
 
 
 class FakeWininet(object):
-
     """Fake wininet for windll."""
 
     connection_state = -1
@@ -140,7 +139,6 @@
 
 
 class FakeWininetException(object):
-
     """Fake wininet for windll."""
 
     connection_state = -1
@@ -153,7 +151,6 @@
 
 
 class TestConnection(TestCase):
-
     """Test the state of the connection."""
 
     @inlineCallbacks

=== modified file 'ubuntu_sso/networkstate/windows.py'
--- ubuntu_sso/networkstate/windows.py	2012-01-04 16:49:43 +0000
+++ ubuntu_sso/networkstate/windows.py	2012-03-27 03:05:20 +0000
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-# Author: Manuel de la Pena <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -207,4 +206,5 @@
         if listener_thread is None:
             listener_thread = Thread(target=listener.register,
                                      name='Ubuntu SSO NetworkManager')
+        listener_thread.daemon = True
         listener_thread.start()