Merge lp:~nataliabidart/ubuntuone-control-panel/device-list-type-error into lp:ubuntuone-control-panel
Proposed by
Natalia Bidart
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 124 |
Merged at revision: | 121 |
Proposed branch: | lp:~nataliabidart/ubuntuone-control-panel/device-list-type-error |
Merge into: | lp:ubuntuone-control-panel |
Diff against target: |
349 lines (+106/-19) 6 files modified
ubuntuone/controlpanel/backend.py (+31/-5) ubuntuone/controlpanel/dbus_client.py (+0/-1) ubuntuone/controlpanel/dbus_service.py (+11/-8) ubuntuone/controlpanel/tests/__init__.py (+10/-0) ubuntuone/controlpanel/tests/test_backend.py (+50/-2) ubuntuone/controlpanel/webclient.py (+4/-3) |
To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-control-panel/device-list-type-error |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Albisetti (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email: mp+55808@code.launchpad.net |
Commit message
- Made the backend robust against possible None values (or any non basestring instance) sent from the API server (LP: #745790).
Description of the change
There is no good way of IRL test this since we would need to force a response from our API servers to send a null device name, for example.
If you insist, you should temporarly change the line 275 in backend.py and set something like:
local_device[
and then run both the backend and UI from this branch.
To post a comment you must log in.
Looks great!