Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/start-dc-on-backend into lp://qastaging/ubuntuone-control-panel
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 56 |
| Merged at revision: | 45 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/start-dc-on-backend |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Prerequisite: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/replication-to-the-backend |
| Diff against target: |
932 lines (+326/-242) 7 files modified
data/install.ui (+7/-2) po/POTFILES.in (+2/-1) pylintrc (+1/-1) ubuntuone/controlpanel/gtk/gui.py (+114/-81) ubuntuone/controlpanel/gtk/tests/__init__.py (+14/-13) ubuntuone/controlpanel/gtk/tests/test_gui.py (+187/-140) ubuntuone/controlpanel/logger.py (+1/-4) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/start-dc-on-backend |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-01-06.
Commit message
Desktopcouch replication service is accessed through the backend using its DBus service (LP: #696782).
Description of the change
To test, first check that all the desktopcouch related packages are uninstalled, and that no desktopcouch nor couchdb process is running. This meaning:
sudo apt-cache search couch
should show no package installed, and:
ps aux | grep couch
should return no results. Then, from this branch, run:
terminal 1: DEBUG=True PYTHONPATH=. ./bin/ubuntuone
terminal 2: DEBUG=True PYTHONPATH=. ./bin/ubuntuone
And go to the third tab and install dc-u1 from there, and keep playing. You should get no hangs at all in the UI.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Works as advertised, code looks good. I don't like the desktopcouch pairing functionality as it stands, but that's in the design, so we'll discuss elsewhere.