Ubuntu One Control Panel

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

use-webclient
Merge into trunk

Proposed by Natalia Bidart on 2012-02-06

Status:

Merged

Approved by:

Natalia Bidart on 2012-02-08

Approved revision:

265

Merged at revision:

258

Proposed branch:

lp://qastaging/~nataliabidart/ubuntuone-control-panel/use-webclient

Merge into:

lp://qastaging/ubuntuone-control-panel

Diff against target:

2046 lines (+478/-1084)

24 files modified

setup.py (+0/-1)
ubuntuone/controlpanel/backend.py (+46/-27)
ubuntuone/controlpanel/gui/__init__.py (+33/-50)
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/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/use-webclient

Related bugs:

Bug #926311: Should use the SSO webclient	High	Fix Released
Bug #927890: Should drop dependency on qt4reactor in Linux	High	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Alejandro J. Cura (community)		Approve on 2012-02-07
Roberto Alsina (community)	2012-02-06	Approve on 2012-02-06
Review via email: mp+91676@code.qastaging.launchpad.net

Commit message

- Replaced custom webclient with the one from ubuntu-sso-client
(LP: #926311).
- Removed the dependency on qt4reactor for Linux implementation.

Revision history for this message

Roberto Alsina (ralsina) wrote on 2012-02-06:

Looks good to me....

review: Approve

Revision history for this message

Natalia Bidart (nataliabidart) wrote on 2012-02-06:

The controlpanel, in order to run on windows, will need:

https://code.launchpad.net/~nataliabidart/ubuntu-sso-client/delay-reactor-import/+merge/91712

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2012-02-07:

Code looks nice, all tests pass, tested IRL on linux.

review: Approve

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/use-webclient 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/test_web_client.py", line 24, in <module>
    from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
ImportError: No module named tests