Merge lp://staging/~ted/url-dispatcher/is-scope-check into lp://staging/url-dispatcher/16.10

Proposed by Ted Gould
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
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: mp+302075@code.staging.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote :

Made some inliners below.

review: Needs Fixing
Revision history for this message
Ted Gould (ted) :
118. By Ted Gould

Merge trunk

119. By Ted Gould

Fix build type check

120. By Ted Gould

Vertically compress code

121. By Ted Gould

Learn real good like what year it is

122. By Ted Gould

Use default constructor/destructors

123. By Ted Gould

Use the C99 bool type

124. By Ted Gould

2016

125. By Ted Gould

Adding a TODO for using the GMock based mock

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Larry Price (larryprice) wrote :

thanks for all the recycles

lgtm

review: Approve
126. By Ted Gould

Grab the crossbuild branch to resolve conflicts

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:125
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/18/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/618/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/624
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/447/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/447/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/447/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/447/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/447/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/447/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/447/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/447/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/447
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/447/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/18/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches