Merge lp://qastaging/~dobey/desktopcouch/fix-696968 into lp://qastaging/desktopcouch
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 244 | ||||
| Merged at revision: | 249 | ||||
| Proposed branch: | lp://qastaging/~dobey/desktopcouch/fix-696968 | ||||
| Merge into: | lp://qastaging/desktopcouch | ||||
| Diff against target: |
233 lines (+59/-34) 6 files modified
desktopcouch/application/platform/linux/__init__.py (+0/-3) desktopcouch/application/plugins/__init__.py (+7/-6) desktopcouch/application/plugins/tests/test_plugins.py (+44/-0) desktopcouch/application/plugins/ubuntuone_pairing.py (+3/-2) desktopcouch/application/service.py (+3/-10) desktopcouch/application/tests/test_service.py (+2/-13) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dobey/desktopcouch/fix-696968 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix the issues with the plug-in loader to actually load the plug-ins
Move the plug-in loading call to the dbus service startup
Remove the old entry_points code using pkg_resources
Description of the change
This fixes the loading of the plug-ins and adds a bit more testing for it.
However, it is not easily testable at the moment, due to further reaching issues with interaction between dbus, main loops, and os.fork in desktopcouch.
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
Looks good