Merge lp://qastaging/~osomon/webbrowser-app/webProcessStatus into lp://qastaging/webbrowser-app
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Approved by: | Olivier Tilloy |
Approved revision: | 1026 |
Merged at revision: | 1159 |
Proposed branch: | lp://qastaging/~osomon/webbrowser-app/webProcessStatus |
Merge into: | lp://qastaging/webbrowser-app |
Diff against target: |
650 lines (+460/-34) 10 files modified
debian/control (+1/-0) src/app/WebProcessMonitor.qml (+79/-0) src/app/webbrowser/Browser.qml (+40/-19) src/app/webbrowser/SadTab.qml (+92/-0) src/app/webbrowser/tabs-model.cpp (+4/-3) tests/autopilot/webbrowser_app/emulators/browser.py (+16/-0) tests/autopilot/webbrowser_app/tests/__init__.py (+11/-0) tests/autopilot/webbrowser_app/tests/test_sad_tab.py (+74/-0) tests/unittests/qml/tst_WebProcessMonitor.qml (+108/-0) tests/unittests/tabs-model/tst_TabsModelTests.cpp (+35/-12) |
To merge this branch: | bzr merge lp://qastaging/~osomon/webbrowser-app/webProcessStatus |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Riccardo Padovani (community) | Approve | ||
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Display a friendly message when the renderer process crashes or is killed.
This adds a runtime dependency for webbrowser-
To post a comment you must log in.
FAILED: Continuous integration, rev:1009 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 1759/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 2791/console jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- amd64-ci/ 516/console jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 516/console jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- i386-ci/ 516/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 2789/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/webbrowser- app-ci/ 1759/rebuild
http://