Merge lp://staging/~unity-api-team/hud/null-guard-itemstore into lp://staging/hud/14.04
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Charles Kerr | ||||
Approved revision: | 384 | ||||
Merged at revision: | 383 | ||||
Proposed branch: | lp://staging/~unity-api-team/hud/null-guard-itemstore | ||||
Merge into: | lp://staging/hud/14.04 | ||||
Prerequisite: | lp://staging/~charlesk/hud/qtgactiongroup-cleanup | ||||
Diff against target: |
59 lines (+31/-2) 2 files modified
service/ItemStore.cpp (+10/-2) tests/unit/service/TestItemStore.cpp (+21/-0) |
||||
To merge this branch: | bzr merge lp://staging/~unity-api-team/hud/null-guard-itemstore | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Charles Kerr | Pending | ||
Review via email: mp+211893@code.staging.launchpad.net |
This proposal supersedes a proposal from 2014-03-18.
Commit message
Add null guards to ItemStore search
Description of the change
* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
* Yes
* Did you build your software in a clean sbuild/pbuilder chroot or ppa?
* Yes
* Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
* Yes
* Has your component "TestPlan” been executed successfully on emulator, N4?
* Yes
* Has a 5 minute exploratory testing run been executed on N4?
* Yes
* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
* N/A
* If you changed the UI, did you subscribe the design-reviewers to this MP?
* No change
* What components might get impacted by your changes?
* Unity7
* Unity8
* Have you requested review by the teams of these owning components?
* Yes
Check List:
https:/
Test Plan:
https:/
Silo:
<waiting for silo>
PASSED: Continuous integration, rev:382 jenkins. qa.ubuntu. com/job/ hud-ci/ 260/ jenkins. qa.ubuntu. com/job/ hud-trusty- amd64-ci/ 111 jenkins. qa.ubuntu. com/job/ hud-trusty- armhf-ci/ 110 jenkins. qa.ubuntu. com/job/ hud-trusty- i386-ci/ 110
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/hud- ci/260/ rebuild
http://