Ubuntu One Control Panel

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

gicrazyness
Merge into trunk

Proposed by Natalia Bidart on 2012-02-06

Status:

Merged

Approved by:

Natalia Bidart on 2012-02-07

Approved revision:

261

Merged at revision:

257

Proposed branch:

lp://qastaging/~nataliabidart/ubuntuone-control-panel/gicrazyness

Merge into:

lp://qastaging/ubuntuone-control-panel

Diff against target:

213 lines (+36/-39)

5 files modified

run-tests (+20/-15)
ubuntuone/controlpanel/gui/gtk/gui.py (+6/-4)
ubuntuone/controlpanel/gui/gtk/tests/__init__.py (+1/-10)
ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py (+7/-8)
ubuntuone/controlpanel/logger.py (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/gicrazyness

Related bugs:

Bug #925617: Tests are not cleaning up some widgets	Medium	Fix Released
Bug #927743: TypeError: could not convert type dbus.Dictionary to PyObject required for parameter 1	High	Fix Released
Bug #927770: Run the whole suite (Non-ui, Gtk, Qt) with a single command	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
dobey (community)		2012-02-06	Approve on 2012-02-06
Review via email: mp+91708@code.qastaging.launchpad.net

Commit message

- 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).

Revision history for this message

dobey (dobey) on 2012-02-06:

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-02-06:

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

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-02-07:

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