Merge lp:~unity-api-team/hud/test-failures into lp:hud/14.04
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Pete Woods | ||||
Approved revision: | 388 | ||||
Merged at revision: | 384 | ||||
Proposed branch: | lp:~unity-api-team/hud/test-failures | ||||
Merge into: | lp:hud/14.04 | ||||
Prerequisite: | lp:~unity-api-team/hud/null-guard-itemstore | ||||
Diff against target: |
534 lines (+105/-49) 18 files modified
libqtgmenu/internal/QtGActionGroup.cpp (+26/-12) libqtgmenu/internal/QtGActionGroup.h (+1/-0) libqtgmenu/internal/QtGMenuImporterPrivate.cpp (+10/-7) libqtgmenu/internal/QtGMenuImporterPrivate.h (+1/-1) libqtgmenu/internal/QtGMenuModel.cpp (+16/-5) libqtgmenu/internal/QtGMenuModel.h (+4/-1) libqtgmenu/internal/QtGMenuUtils.cpp (+14/-0) libqtgmenu/internal/QtGMenuUtils.h (+3/-0) service/ItemStore.cpp (+10/-2) service/ItemStore.h (+1/-1) service/QueryImpl.cpp (+1/-2) service/Window.h (+1/-1) service/WindowImpl.cpp (+3/-3) service/WindowImpl.h (+1/-1) tests/integration/TestHud.cpp (+1/-1) tests/menus/test-menu-input-model-shortcuts.c (+4/-4) tests/unit/qtgmenu/TestQtGMenu.cpp (+6/-6) tests/unit/service/Mocks.h (+2/-2) |
||||
To merge this branch: | bzr merge lp:~unity-api-team/hud/test-failures | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Antti Kaijanmäki (community) | Approve | ||
Review via email:
|
Commit message
Fix test failures exposed by fix to libqtdbustest
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>
FAILED: Continuous integration, rev:384 jenkins. qa.ubuntu. com/job/ hud-ci/ 262/ jenkins. qa.ubuntu. com/job/ hud-trusty- amd64-ci/ 113/console jenkins. qa.ubuntu. com/job/ hud-trusty- armhf-ci/ 112/console jenkins. qa.ubuntu. com/job/ hud-trusty- i386-ci/ 112/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/hud- ci/262/ rebuild
http://