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
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Riccardo Padovani (community) Approve
Ubuntu Phablet Team Pending
Review via email: mp+259040@code.qastaging.launchpad.net

Commit message

Display a friendly message when the renderer process crashes or is killed.
This adds a runtime dependency for webbrowser-app-autopilot on python3-psutil.

To post a comment you must log in.
1009. By Olivier Tilloy

Revert unnecessary version bump.

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

Also bump the build dependency on oxide to allow unit tests to run at build time.

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

Count the number of retries (but keep it limited to one for now).

1012. By Olivier Tilloy

Merge the latest changes from trunk and resolve a conflict.

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

Simplify the code a bit.

1014. By Olivier Tilloy

Merge the latest changes from trunk and resolve a couple of conflicts.

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

Make the SadTab component browser-specific.

1016. By Olivier Tilloy

Updated SadTab to match visual specification.

1017. By Olivier Tilloy

Fix the sad tab disappearing after a minute.

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

Merge the latest changes from trunk and resolve conflicts.

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

Merge the latest changes from trunk and resolve a conflict.

1020. By Olivier Tilloy

Fix autopilot tests on desktop where closing the last open tab exits the application.

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

Merge the latest changes from trunk.

1022. By Olivier Tilloy

Update imports.

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

Useful function, thanks!

lgtm, just a note in the code I don't understand.

review: Needs Information
1023. By Olivier Tilloy

Merge the latest changes from trunk.

1024. By Olivier Tilloy

Fix closing the current tab (the assumption that the current tab is always the first one is not valid any longer).

1025. By Olivier Tilloy

Use name() instead of exe() to avoid raising an AccessDenied exception.

Revision history for this message
Olivier Tilloy (osomon) wrote :

> I don't understand this: if it should close the current tab,
> why does it close the first?

Very good catch, thanks Riccardo!
The assumption [current tab == first tab] used to be true when we supported only the mobile form factor, where the current tab was always pushed to the top of the stack. This is not valid any longer, so I updated the code to reflect that.

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

Update the tab model’s current index when a tab before the current one is removed.

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Lgtm now, thanks!

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

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 status/vote changes: