Merge lp://staging/~ted/url-dispatcher/is-scope-check into lp://staging/url-dispatcher/16.10
Status: | Merged |
---|---|
Approved by: | Larry Price |
Approved revision: | 125 |
Merged at revision: | 94 |
Proposed branch: | lp://staging/~ted/url-dispatcher/is-scope-check |
Merge into: | lp://staging/url-dispatcher/16.10 |
Diff against target: |
904 lines (+571/-18) 17 files modified
CMakeLists.txt (+8/-2) debian/control (+7/-5) debian/rules (+3/-0) service/CMakeLists.txt (+6/-1) service/dispatcher.c (+119/-3) service/dispatcher.h (+2/-1) service/scope-checker-facade.h (+27/-0) service/scope-checker.cpp (+114/-0) service/scope-checker.h (+29/-0) service/service.c (+9/-1) tests/CMakeLists.txt (+3/-0) tests/app-id-test.cc (+1/-1) tests/apparmor-mock.c (+36/-0) tests/apparmor-mock.h (+20/-0) tests/dispatcher-test.cc (+84/-1) tests/scope-mock.h (+95/-0) tests/service-test.cc (+8/-3) |
To merge this branch: | bzr merge lp://staging/~ted/url-dispatcher/is-scope-check |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
unity-api-1-bot | continuous-integration | Needs Fixing | |
Larry Price | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email:
|
This proposal supersedes a proposal from 2015-06-22.
Commit message
Scope testing for the scope:// URL and overlays that should be over the dash
Description of the change
This MR adds in the ability to check to see if something is a scope, which we use for a couple of things. The first is so that we can return errors to the calling process for the scope:// URL early, meaning applications can know if their call resulted in an error without the user just being confused why the button didn't work. The second is for overlays where we get called by a scope, so we need to overlay the window on top of the dash instead of the scope process.
I'll note that the Unity Scopes API makes testing its usage basically impossible. There is some pretty huge hoops that are jumped through here to test it. Not happy about them, but the code is tested. Disappointed in the scopes API.
FAILED: Continuous integration, rev:116 jenkins. qa.ubuntu. com/job/ url-dispatcher- ci/182/ jenkins. qa.ubuntu. com/job/ url-dispatcher- wily-amd64- ci/18 jenkins. qa.ubuntu. com/job/ url-dispatcher- wily-armhf- ci/18 jenkins. qa.ubuntu. com/job/ url-dispatcher- wily-i386- ci/18/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/url- dispatcher- ci/182/ rebuild
http://