Unity Media Scanner Scope

Merge lp://qastaging/~jamesh/unity-scope-mediascanner/limit-results into lp://qastaging/unity-scope-mediascanner

limit-results
Merge into trunk

Proposed by James Henstridge on 2014-01-30

Status:	Merged
Merged at revision:	50
Proposed branch:	lp://qastaging/~jamesh/unity-scope-mediascanner/limit-results
Merge into:	lp://qastaging/unity-scope-mediascanner
Diff against target:	271 lines (+71/-13) 11 files modified oldscope/base-scope.cpp (+5/-2) oldscope/main.cpp (+2/-0) oldscope/music-scope.cpp (+2/-0) oldscope/scope.h (+7/-7) oldscope/video-scope.cpp (+2/-0) src/music-scope.cpp (+4/-1) src/music-scope.h (+1/-1) src/video-scope.cpp (+4/-1) src/video-scope.h (+1/-1) tests/test-music-scope.cpp (+1/-0) tests/test-old-scope.cpp (+42/-0)
To merge this branch:	bzr merge lp://qastaging/~jamesh/unity-scope-mediascanner/limit-results
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michal Hruby (community)			Needs Information on 2014-02-03
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-01-31
Jussi Pakkanen (community)		2014-01-30	Approve on 2014-01-30
Review via email: mp+203927@code.qastaging.launchpad.net

Commit message

Limit the number of results we produce, as with the original mediascanner, and add tests to show we produce results in response to empty surfacing queries.

Description of the change

Limit the number of results we produce, as with the original mediascanner, and add tests to show we produce results in response to empty surfacing queries.

This branch depends on https://code.launchpad.net/~jamesh/mediascanner2/empty-query/+merge/203905

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

FAILED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-trusty-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-trusty-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-trusty-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/32/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-01-30:

Yes.

review: Approve

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-01-30:

I want to get the namespace changes into Mediascanner so should we put using directives into this one or a different MR? A superfluous using directive is harmless in this case so we can just plop it in.

lp://qastaging/~jamesh/unity-scope-mediascanner/limit-results updated on 2014-01-31