Merge lp://staging/~ralsina/ubuntuone-control-panel/unique-3-0 into lp://staging/ubuntuone-control-panel/stable-3-0
Proposed by
Roberto Alsina
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 261 | ||||
Merged at revision: | 261 | ||||
Proposed branch: | lp://staging/~ralsina/ubuntuone-control-panel/unique-3-0 | ||||
Merge into: | lp://staging/ubuntuone-control-panel/stable-3-0 | ||||
Diff against target: |
284 lines (+67/-113) 8 files modified
run-tests (+1/-1) ubuntuone/controlpanel/gui/qt/main/__init__.py (+1/-0) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+13/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py (+28/-8) ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py (+0/-29) ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py (+2/-23) ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py (+0/-52) ubuntuone/controlpanel/gui/tests/__init__.py (+22/-0) |
||||
To merge this branch: | bzr merge lp://staging/~ralsina/ubuntuone-control-panel/unique-3-0 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Review via email: mp+103489@code.staging.launchpad.net |
Commit message
- Implemented UniqueApplication for Linux (Fixes LP:987909).
Description of the change
- Implemented UniqueApplication for Linux (Fixes LP:987909).
To post a comment you must log in.
The attempt to merge lp:~ralsina/ubuntuone-control-panel/unique-3-0 into lp:ubuntuone-control-panel/stable-3-0 failed. Below is the output from the failed tests.
*** Running test suite for ubuntuone/ controlpanel ***
Traceback (most recent call last): get_suite( config) 'ignore- paths'] )) unittest( filepath) cache/ubuntuone -control- panel/stable- 3-0/ubuntuone/ controlpanel/ tests/test_ web_client. py", line 24, in <module> sso.utils. webclient. tests import BaseMockWebServer
File "/usr/bin/u1trial", line 337, in <module>
main()
File "/usr/bin/u1trial", line 317, in main
suite = trial_runner.
File "/usr/bin/u1trial", line 196, in get_suite
config[
File "/usr/bin/u1trial", line 180, in _collect_tests
module_suite = self._load_
File "/usr/bin/u1trial", line 120, in _load_unittest
module = __import__(modpath, None, None, [""])
File "/mnt/tarmac/
from ubuntu_
ImportError: cannot import name BaseMockWebServer