Merge lp:~nataliabidart/ubuntuone-control-panel/gicrazyness into lp:ubuntuone-control-panel

[Natalia Bidart]

- Avoid TypeError when fetching credentials in the Gtk OverviewPanel
   (LP: #927743).
- Run the whole test suite with a single command (LP: #927770).
- Do proper cleanup when dealing with UIs (LP: #925617).

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/gicrazyness into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
The Python package providing the requested reactor is not installed. You can find it here: http://twistedmatrix.com/trac/ticket/4558

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 325, in <module>
    main()
  File "/usr/bin/u1trial", line 298, in main
    reactor.install(options=config)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/reactors/gi.py", line 27, in install
    glibreactor = __import__(reactor_name, None, None, [''])
ImportError: No module named gireactor

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/gicrazyness into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 325, in <module>
    main()
  File "/usr/bin/u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/home/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/tests/__init__.py", line 28, in <module>
    from ubuntuone.controlpanel.backend import (
  File "/home/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/backend.py", line 31, in <module>
    from ubuntuone.platform import is_link
  File "/usr/lib/python2.7/dist-packages/ubuntuone-client/ubuntuone/platform/__init__.py", line 31, in <module>
    from ubuntuone.platform import linux
  File "/usr/lib/python2.7/dist-packages/ubuntuone-client/ubuntuone/platform/linux/__init__.py", line 24, in <module>
    from ubuntuone.platform.linux.os_helper import (
  File "/usr/lib/python2.7/dist-packages/ubuntuone-client/ubuntuone/platform/linux/os_helper.py", line 33, in <module>
    import gio
ImportError: No module named gio

=== modified file 'run-tests'
--- run-tests	2012-01-18 17:40:33 +0000
+++ run-tests	2012-02-06 21:07:20 +0000
@@ -18,17 +18,11 @@
 
 QT_TESTS_PATH=ubuntuone/controlpanel/gui/qt/tests
 GTK_TESTS_PATH=ubuntuone/controlpanel/gui/gtk/tests
+DBUS_TESTS_PATH=ubuntuone/controlpanel/dbustests
 WINDOWS_TESTS=test_windows.py
 
 set -e
 
-if [ "$1" == "-qt" ]; then
-    USE_QT=1
-    shift
-else
-    USE_QT=0
-fi
-
 if [ $# -ne 0 ]; then
     # run specific module given by the caller
     MODULE="$@"
@@ -45,16 +39,27 @@
         echo "Please install the 'pep8' package."
     fi
 }
-
 unset GTK_MODULES
 
+XVFB_CMDLINE=""
+XVFB=$(which xvfb-run)
+if [ $XVFB ]; then
+    XVFB_CMDLINE="$XVFB -a"
+fi
+
+echo "*** Running test suite for ""$MODULE"" ***"
+u1trial --reactor=gi -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH, $GTK_TESTS_PATH" -i "$WINDOWS_TESTS" "$MODULE"
+
+echo "*** Running DBus test suite ***"
+u1trial --reactor=glib "$DBUS_TESTS_PATH"
+
+echo "*** Running GTK test suite ***"
+$XVFB_CMDLINE u1trial --reactor=glib "$GTK_TESTS_PATH"
+
+echo "*** Running QT test suite for ""$MODULE"" ***"
 ./setup.py build
-echo "Running test suite for ""$MODULE"
-if [ "$USE_QT" -eq 0 ]; then
-    `which xvfb-run` u1trial --ignore-paths "$QT_TESTS_PATH" -i "$WINDOWS_TESTS" "$MODULE"
-else
-    `which xvfb-run` u1trial --ignore-paths "$GTK_TESTS_PATH" -i "$WINDOWS_TESTS" --reactor=qt4 --gui "$MODULE"
-fi
-style_check
+$XVFB_CMDLINE u1trial -p "$GTK_TESTS_PATH" -i "$WINDOWS_TESTS" --reactor=qt4 --gui "$MODULE"
 rm -rf _trial_temp
 rm -rf build
+
+style_check
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2012-01-23 20:15:09 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2012-02-06 21:07:20 +0000
@@ -178,6 +178,9 @@
         label.set_markup(WARNING_MARKUP % message)
         label.show()
 
+    def destroy(self):
+        """Cleanup."""
+
 
 class UbuntuOneBin(gtk.VBox):
     """A Ubuntu One bin."""
@@ -248,7 +251,7 @@
 
     __gsignals__ = {
         'credentials-found': (gobject.SIGNAL_RUN_FIRST,  gobject.TYPE_NONE,
-                              (gobject.TYPE_BOOLEAN, gobject.TYPE_PYOBJECT)),
+                              (gobject.TYPE_BOOLEAN,)),
     }
 
     def __init__(self, main_window):
@@ -345,7 +348,7 @@
     def on_credentials_found(self, credentials):
         """Credentials backend notifies of credentials found."""
         self.set_property('greyed', False)
-        self.emit('credentials-found', self._credentials_are_new, credentials)
+        self.emit('credentials-found', self._credentials_are_new)
 
     @log_call(logger.info)
     def on_credentials_not_found(self):
@@ -1568,8 +1571,7 @@
         """Show the overview panel."""
         self.set_current_page(0)
 
-    def on_show_management_panel(self, widget=None,
-                                 credentials_are_new=False, token=None):
+    def on_show_management_panel(self, widget=None, credentials_are_new=False):
         """Show the notebook (main panel)."""
         if self.get_current_page() == 0:
             self.management.load()
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gui/gtk/tests/__init__.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/__init__.py	2012-02-06 21:07:20 +0000
@@ -202,21 +202,12 @@
 
         if self.klass is not None:
             self.ui = self.klass(**self.kwargs)
+            self.addCleanup(self.ui.destroy)
 
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)
         gui.logger.addHandler(self.memento)
 
-    @defer.inlineCallbacks
-    def tearDown(self):
-        try:
-            self.ui.hide()
-            del self.ui
-            self.ui = None
-        except AttributeError:
-            pass
-        yield super(BaseTestCase, self).tearDown()
-
     def assert_image_equal(self, image, filename):
         """Check that expected and actual represent the same image."""
         pb = gui.gtk.gdk.pixbuf_new_from_file(gui.get_data_file(filename))
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-11-21 13:32:44 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2012-02-06 21:07:20 +0000
@@ -278,7 +278,7 @@
 
         """
         self.patch(self.ui.management, 'load', self._set_called)
-        self.ui.overview.emit('credentials-found', False, object())
+        self.ui.overview.emit('credentials-found', False)
 
         self.assert_current_tab_correct(self.ui.management)
         self.assertEqual(self.ui.management.notebook.get_current_page(),
@@ -291,8 +291,7 @@
         If first signal parameter is True, visible tab should be services.
 
         """
-        a_token = object()
-        self.ui.overview.emit('credentials-found', True, a_token)
+        self.ui.overview.emit('credentials-found', True)
 
         self.assert_current_tab_correct(self.ui.management)
         self.assertEqual(self.ui.management.notebook.get_current_page(),
@@ -301,19 +300,19 @@
     def test_credentials_found_connects_syncdaemon(self):
         """On 'credentials-found' signal, ask syncdaemon to connect."""
         # credentials are new
-        self.ui.overview.emit('credentials-found', True, object())
+        self.ui.overview.emit('credentials-found', True)
         self.assert_backend_called('connect_files')
 
     def test_local_device_removed_shows_overview_panel(self):
         """On 'local-device-removed' signal, the overview panel is shown."""
-        self.ui.overview.emit('credentials-found', True, object())
+        self.ui.overview.emit('credentials-found', True)
         self.ui.management.emit('local-device-removed')
 
         self.assert_current_tab_correct(self.ui.overview)
 
     def test_unauthorized_shows_overview_panel(self):
         """On 'unauthorized' signal, the overview panel is shown."""
-        self.ui.overview.emit('credentials-found', True, object())
+        self.ui.overview.emit('credentials-found', True)
         self.ui.management.emit('unauthorized')
 
         self.assert_current_tab_correct(self.ui.overview)
@@ -628,7 +627,7 @@
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
         # assume credentials were in local keyring
-        self.assertEqual(self._called, ((self.ui, False, TOKEN), {}))
+        self.assertEqual(self._called, ((self.ui, False), {}))
 
     def test_on_credentials_found_when_creds_are_not_new(self):
         """Callback 'on_credentials_found' distinguish if creds are new."""
@@ -641,7 +640,7 @@
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
         # assume credentials were not in local keyring
-        self.assertEqual(self._called, ((self.ui, True, TOKEN), {}))
+        self.assertEqual(self._called, ((self.ui, True), {}))
 
     def test_on_credentials_not_found(self):
         """Callback 'on_credentials_not_found' is correct."""
 
=== modified file 'ubuntuone/controlpanel/logger.py'
--- ubuntuone/controlpanel/logger.py	2011-08-30 16:10:36 +0000
+++ ubuntuone/controlpanel/logger.py	2012-02-06 21:07:20 +0000
@@ -34,7 +34,7 @@
     LOG_LEVEL = logging.DEBUG
 else:
     # Only log this level and above
-    LOG_LEVEL = logging.DEBUG  # before final release, switch to INFO
+    LOG_LEVEL = logging.INFO
 
 FILE_NAME = os.path.join(ubuntuone_log_dir, 'controlpanel.log')
 MAIN_HANDLER = RotatingFileHandler(FILE_NAME,
@@ -53,7 +53,7 @@
     logger = logging.getLogger('ubuntuone.controlpanel.%s' % log_domain)
     logger.setLevel(LOG_LEVEL)
     logger.addHandler(MAIN_HANDLER)
-    if os.environ.get('DEBUG'):
+    if os.environ.get('U1_DEBUG'):
         debug_handler = logging.StreamHandler(sys.stderr)
         debug_handler.setFormatter(basic_formatter)
         logger.addHandler(debug_handler)