Merge lp://qastaging/~cmiller/desktopcouch/service-must-not-call-self-over-dbus into lp://qastaging/desktopcouch
Proposed by
Chad Miller
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||
Approved revision: | 268 | ||||
Merged at revision: | 264 | ||||
Proposed branch: | lp://qastaging/~cmiller/desktopcouch/service-must-not-call-self-over-dbus | ||||
Merge into: | lp://qastaging/desktopcouch | ||||
Diff against target: |
336 lines (+82/-34) 6 files modified
desktopcouch/application/plugins/__init__.py (+2/-2) desktopcouch/application/plugins/tests/test_plugins.py (+6/-1) desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py (+22/-15) desktopcouch/application/plugins/ubuntuone_pairing.py (+17/-11) desktopcouch/application/service.py (+4/-4) desktopcouch/application/tests/test_service.py (+31/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~cmiller/desktopcouch/service-must-not-call-self-over-dbus | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Eric Casteleijn (community) | Approve | ||
Review via email:
|
Commit message
When running plugin code in initializing the desktopcouch service, do not call any functions that require that the service be running and answering DBus method calls. In particular, we already know the port couchdb is listening on, so do not ask for that via DBus client call, but explicity pass it into the plugin function calls. (LP: #706939)
To post a comment you must log in.
Tests are not passing in this branch (and they are in trunk, just confirmed). Errors are:
http:// pastebin. ubuntu. com/557691/