Merge lp:~nataliabidart/ubuntuone-control-panel/decouple-devices into lp:ubuntuone-control-panel
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 120 |
Merged at revision: | 117 |
Proposed branch: | lp:~nataliabidart/ubuntuone-control-panel/decouple-devices |
Merge into: | lp:ubuntuone-control-panel |
Diff against target: |
254 lines (+127/-54) 3 files modified
ubuntuone/controlpanel/backend.py (+75/-40) ubuntuone/controlpanel/tests/__init__.py (+14/-12) ubuntuone/controlpanel/tests/test_backend.py (+38/-2) |
To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-control-panel/decouple-devices |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Alejandro J. Cura (community) | Approve | ||
Review via email: mp+55345@code.launchpad.net |
Commit message
- Decoupled device list retrieved from the web from the local settings retrieved from syncdaemon (LP: #720704).
Description of the change
This change decouples the retrieval of the device info list from the retrieval of local settings from syncdaemon.
To test this, you should:
killall ubuntuone-
In two terminals, run:
DEBUG=True PYTHONPATH=. bin/ubuntuone-
DEBUG=True PYTHONPATH=. bin/ubuntuone-
The first test would be disconnecting your network connection and going to the devices tab, you should see a single device (your local device).
The second test is more complex, since it requires that syncdaemon is disabled. Due to bug bug #744980, you need to:
* u1sdtool -q
* edit ~/.config/
* re-run the control panel backend and frontend
* go to the devices tab and confirm that the device list is retrieved, but no local settings are offered
Nice branch!