Ubuntu One Control Panel

Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.4 into lp://qastaging/ubuntuone-control-panel/stable-3-0

stable-3-0-update-2.99.4
Merge into stable-3-0

Proposed by Natalia Bidart on 2012-02-14

Status:

Merged

Approved by:

Natalia Bidart on 2012-02-15

Approved revision:

249

Merged at revision:

248

Proposed branch:

lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.4

Merge into:

lp://qastaging/ubuntuone-control-panel/stable-3-0

Diff against target:

2307 lines (+540/-1126)

30 files modified

run-tests (+20/-15)
run-tests.bat (+25/-3)
setup.py (+1/-1)
ubuntuone/controlpanel/backend.py (+46/-27)
ubuntuone/controlpanel/gui/__init__.py (+33/-50)
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/gui/qt/folders.py (+2/-7)
ubuntuone/controlpanel/gui/qt/gotoweb.py (+2/-12)
ubuntuone/controlpanel/gui/qt/gui.py (+3/-3)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+5/-14)
ubuntuone/controlpanel/gui/qt/main/linux.py (+11/-3)
ubuntuone/controlpanel/gui/qt/main/windows.py (+21/-0)
ubuntuone/controlpanel/gui/qt/systray.py (+4/-5)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+29/-21)
ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+5/-52)
ubuntuone/controlpanel/gui/qt/tests/test_signin.py (+2/-5)
ubuntuone/controlpanel/gui/qt/tests/test_start.py (+89/-91)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+0/-2)
ubuntuone/controlpanel/gui/tests/test_url_sign.py (+0/-102)
ubuntuone/controlpanel/logger.py (+2/-2)
ubuntuone/controlpanel/tests/test_backend.py (+66/-1)
ubuntuone/controlpanel/tests/test_web_client.py (+107/-84)
ubuntuone/controlpanel/web_client.py (+53/-61)
ubuntuone/controlpanel/web_client/libsoup.py (+0/-133)
ubuntuone/controlpanel/web_client/tests/__init__.py (+0/-19)
ubuntuone/controlpanel/web_client/tests/test_libsoup.py (+0/-106)
ubuntuone/controlpanel/web_client/tests/test_txwebclient.py (+0/-177)
ubuntuone/controlpanel/web_client/txwebclient.py (+0/-108)

To merge this branch:

bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.4

Related bugs:

Bug #924384: Allow to pass extra parameters to run-tests.bat that should be fowarded to u1trial	Medium	Fix Released
Bug #925617: Tests are not cleaning up some widgets	Medium	Fix Released
Bug #926311: Should use the SSO webclient	High	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
Bug #930269: ImportError: No module named uniqueapp	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2012-02-14	Approve on 2012-02-15
Review via email: mp+93090@code.qastaging.launchpad.net

Commit message

- Updating from trunk up to revno 259:

[ Natalia B. Bidart <email address hidden> ]
  - Install the uniqueapp module (LP: #930269).
  - Replaced custom webclient with the one from ubuntu-sso-client
    (LP: #926311).
  - Removed the dependency on qt4reactor for Linux implementation.
  - 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).

[ Manuel de la Pena <email address hidden> ]
- Forward extra params to u1trial (LP: #924384).