unity-scopes-shell

Merge lp://staging/~unity-api-team/unity-scopes-shell/department-support into lp://staging/unity-scopes-shell

  1. department-support
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 132
Merged at revision: 101
Proposed branch: lp://staging/~unity-api-team/unity-scopes-shell/department-support
Merge into: lp://staging/unity-scopes-shell
Diff against target: 2000 lines (+1266/-110)
24 files modified
debian/changelog (+7/-0)
debian/control (+3/-3)
src/Unity/CMakeLists.txt (+3/-0)
src/Unity/collectors.cpp (+24/-10)
src/Unity/collectors.h (+4/-3)
src/Unity/department.cpp (+157/-0)
src/Unity/department.h (+86/-0)
src/Unity/departmentnode.cpp (+126/-0)
src/Unity/departmentnode.h (+71/-0)
src/Unity/plugin.cpp (+2/-0)
src/Unity/scope.cpp (+209/-29)
src/Unity/scope.h (+72/-4)
src/Unity/scopes.cpp (+1/-1)
tests/CMakeLists.txt (+1/-0)
tests/data/CMakeLists.txt (+1/-0)
tests/data/mock-scope-departments/CMakeLists.txt (+16/-0)
tests/data/mock-scope-departments/mock-scope-departments.cpp (+193/-0)
tests/data/mock-scope-departments/mock-scope-departments.ini.in (+8/-0)
tests/data/mock-scope-ttl/mock-scope-ttl.cpp (+6/-12)
tests/data/mock-scope/CMakeLists.txt (+2/-2)
tests/data/mock-scope/mock-scope.cpp (+26/-29)
tests/departmentstest.cpp (+236/-0)
tests/previewtest.cpp (+3/-2)
tests/resultstest.cpp (+9/-15)
To merge this branch: bzr merge lp://staging/~unity-api-team/unity-scopes-shell/department-support
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Paweł Stołowski Pending
Review via email: mp+222345@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-06-03.

Commit message

Added support for departments

Description of the change

Added support for departments. Note that this requires changes to lp:unity-api (https://code.launchpad.net/~unity-team/unity-api/departments/+merge/221241) plus changes to libunity-scopes departments API (present in lp:unity-scopes-api/devel).

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

FAILED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/124/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/124/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

Some small comments over a quick code review.

Will check tests tomorrow.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/125/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/125/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

My small comments were indeed a "Needs fixing"

review: Needs Fixing
Revision history for this message
Paweł Stołowski (stolowski) : Posted in a previous version of this proposal
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

Besides my small inline comments from https://code.launchpad.net/%7Emhr3/unity-scopes-shell/department-support/+merge/221883/+index the rest looks nice :)

Revision history for this message
Pete Woods (pete-woods) wrote :

I've just merged trunk into this branch to resolve the conflicts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:125
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-api-team/unity-scopes-shell/department-support/+merge/222345/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/26/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/129/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~unity-api-team/unity-scopes-shell/department-support updated
126. By Pete Woods

Only try and process departments if we have a root department

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/130/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/130/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) : Posted in a previous version of this proposal
lp://staging/~unity-api-team/unity-scopes-shell/department-support updated
127. By Michal Hruby

Always update last root department

128. By Michal Hruby

Rename the parameter for collect method

129. By Michal Hruby

Act on review comments

Revision history for this message
Michal Hruby (mhr3) wrote : Posted in a previous version of this proposal

Should be all addressed now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:129
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/131/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/131/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote : Posted in a previous version of this proposal

Eh, in the superseding branch...

lp://staging/~unity-api-team/unity-scopes-shell/department-support updated
130. By Michal Hruby

Make tests compile with 0.5.0

131. By Michal Hruby

Bump the version

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/132/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/132/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:131
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/133/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/133/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~unity-api-team/unity-scopes-shell/department-support updated
132. By Michal Hruby

Minimize department cache invalidations

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:132
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/134/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good to me

review: Approve

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

to all changes: