webbrowser-app

Merge lp:~osomon/webbrowser-app/webProcessStatus into lp:webbrowser-app

webProcessStatus
Merge into trunk

Proposed by Olivier Tilloy on 2015-05-13

Status:

Merged

Approved by:

Olivier Tilloy on 2015-09-02

Approved revision:

1026

Merged at revision:

1159

Proposed branch:

lp:~osomon/webbrowser-app/webProcessStatus

Merge into:

lp: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:~osomon/webbrowser-app/webProcessStatus

High

Fix Released

Link a bug report

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

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-05-13

1009. By Olivier Tilloy on 2015-05-13: Revert unnecessary version bump.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-13:

FAILED: Continuous integration, rev:1009
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1759/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2791/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2789/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1759/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-05-14

1010. By Olivier Tilloy on 2015-05-14: 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 on 2015-05-14:

FAILED: Continuous integration, rev:1010
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1763/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2805/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2803/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1763/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-05-14

1011. By Olivier Tilloy on 2015-05-14: Count the number of retries (but keep it limited to one for now).
1012. By Olivier Tilloy on 2015-05-14: Merge the latest changes from trunk and resolve a conflict.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-14:

FAILED: Continuous integration, rev:1012
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1764/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2807/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2805/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1764/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-06-12

1013. By Olivier Tilloy on 2015-06-12: Simplify the code a bit.
1014. By Olivier Tilloy on 2015-06-12: Merge the latest changes from trunk and resolve a couple of conflicts.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-12:

FAILED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1885/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3185/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/642/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/642/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/642/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3183/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1885/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-06-12

1015. By Olivier Tilloy on 2015-06-12: Make the SadTab component browser-specific.
1016. By Olivier Tilloy on 2015-06-12: Updated SadTab to match visual specification.
1017. By Olivier Tilloy on 2015-06-12: Fix the sad tab disappearing after a minute.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-12:

FAILED: Continuous integration, rev:1017
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1887/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/644/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/644/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/644/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3186/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1887/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-07-03

1018. By Olivier Tilloy on 2015-07-03: Merge the latest changes from trunk and resolve conflicts.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-03:

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1956/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3362/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1956/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-08-03

1019. By Olivier Tilloy on 2015-08-03: Merge the latest changes from trunk and resolve a conflict.
1020. By Olivier Tilloy on 2015-08-03: 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 on 2015-08-03:

FAILED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2026/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3558/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/780/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/780/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/780/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3555/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2026/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-08-12

1021. By Olivier Tilloy on 2015-08-12: Merge the latest changes from trunk.
1022. By Olivier Tilloy on 2015-08-12: Update imports.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2079/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Riccardo Padovani (rpadovani) wrote on 2015-08-31:

Useful function, thanks!

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

review: Needs Information

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-09-02

1023. By Olivier Tilloy on 2015-09-02: Merge the latest changes from trunk.
1024. By Olivier Tilloy on 2015-09-02: 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 on 2015-09-02: Use name() instead of exe() to avoid raising an AccessDenied exception.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2015-09-02:

> 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 on 2015-09-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2159/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/webProcessStatus updated on 2015-09-02

1026. By Olivier Tilloy on 2015-09-02: 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 on 2015-09-02:

Lgtm now, thanks!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2165/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Olivier Tilloy

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === modified file 'debian/control'
 --- debian/control	2015-08-25 13:56:58 +0000
 +++ debian/control	2015-09-02 16:48:16 +0000
@@ -122,6 +122,7 @@
           autopilot-qt5,
           python3-autopilot,
           python3-fixtures,
++         python3-psutil,
           ubuntu-ui-toolkit-autopilot,
           webbrowser-app (>= ${binary:Version}),
  Description: Ubuntu web browser autopilot tests
 === added file 'src/app/WebProcessMonitor.qml'
 --- src/app/WebProcessMonitor.qml	1970-01-01 00:00:00 +0000
 +++ src/app/WebProcessMonitor.qml	2015-09-02 16:48:16 +0000
@@ -0,0 +1,79 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import com.canonical.Oxide 1.8 as Oxide
++
++Item {
++    id: monitor
++
++    visible: false
++
++    property var webview: null
++
++    readonly property bool killed: webview &&
++                                   (webview.webProcessStatus == Oxide.WebView.WebProcessKilled)
++    readonly property bool crashed: webview &&
++                                    (webview.webProcessStatus == Oxide.WebView.WebProcessCrashed)
++
++    // When the renderer process is killed (most likely by the system’s
++    // OOM killer), try to reload the page once, and if this results in
++    // the process being killed again within one minute, then display
++    // the sad tab.
++
++    readonly property int killedRetries: internal.killedRetries
++
++    QtObject {
++        id: internal
++        property int killedRetries: 0
++    }
++
++    Connections {
++        target: webview
++        onWebProcessStatusChanged: {
++            if (webview.webProcessStatus == Oxide.WebView.WebProcessKilled) {
++                if (internal.killedRetries == 0) {
++                    // Do not attempt reloading right away, this would result in a crash
++                    delayedReload.restart()
++                }
++            }
++        }
++    }
++
++    Timer {
++        id: delayedReload
++        interval: 100
++        onTriggered: {
++            monitorTimer.restart()
++            monitor.webview.reload()
++            internal.killedRetries++
++        }
++    }
++
++    Timer {
++        id: monitorTimer
++        interval: 60000 // 1 minute
++        onTriggered: internal.killedRetries = 0
++    }
++
++    onWebviewChanged: {
++        internal.killedRetries = 0
++        delayedReload.stop()
++        monitorTimer.stop()
++    }
++}
 === modified file 'src/app/webbrowser/Browser.qml'
 --- src/app/webbrowser/Browser.qml	2015-08-27 14:02:05 +0000
 +++ src/app/webbrowser/Browser.qml	2015-09-02 16:48:16 +0000
@@ -206,6 +206,7 @@
          Loader {
              id: newTabViewLoader
++
              anchors {
                  fill: tabContainer
                  topMargin: (chrome.state == "shown") ? chrome.height : 0
@@ -290,6 +291,27 @@
+             }
+         }
++        Loader {
++            anchors {
++                fill: tabContainer
++                topMargin: (chrome.state == "shown") ? chrome.height : 0
++            }
++
++            active: webProcessMonitor.crashed || (webProcessMonitor.killed && !currentWebview.loading)
++
++            sourceComponent: SadTab {
++                webview: currentWebview
++                onCloseTabRequested: internal.closeCurrentTab()
++            }
++
++            WebProcessMonitor {
++                id: webProcessMonitor
++                webview: currentWebview
++            }
++
++            asynchronous: true
++        }
++
          SearchEngine {
              id: currentSearchEngine
              searchPaths: searchEnginesSearchPaths
@@ -603,16 +625,7 @@
+             }
              chromeOffset: chrome.height - invisibleTabChrome.height
              onTabSelected: recentView.closeAndSwitchToTab(index)
--            onTabClosed: {
--                var tab = tabsModel.remove(index)
--                if (tab) {
--                    tab.close()
--                }
--                if (tabsModel.count === 0) {
--                    browser.openUrlInNewTab("", true)
--                    recentView.reset()
--                }
--            }
++            onTabClosed: internal.closeTab(index)
+         }
          Toolbar {
@@ -1192,6 +1205,23 @@
+             }
+         }
++        function closeTab(index) {
++            var tab = tabsModel.remove(index)
++            if (tab) {
++                tab.close()
++            }
++            if (tabsModel.count === 0) {
++                browser.openUrlInNewTab("", true)
++                recentView.reset()
++            }
++        }
++
++        function closeCurrentTab() {
++            if (tabsModel.count > 0) {
++                closeTab(tabsModel.currentIndex)
++            }
++        }
++
          function switchToTab(index) {
              tabsModel.currentIndex = index
              var tab = tabsModel.currentTab
@@ -1205,15 +1235,6 @@
+             }
+         }
--        function closeCurrentTab() {
--            if (tabsModel.count > 0) {
--                var tab = tabsModel.remove(tabsModel.currentIndex)
--                if (tab) {
--                    tab.close()
--                }
--            }
--        }
--
          function focusAddressBar(selectContent) {
              chrome.forceActiveFocus()
              Qt.inputMethod.show() // work around http://pad.lv/1316057
 === added file 'src/app/webbrowser/SadTab.qml'
 --- src/app/webbrowser/SadTab.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webbrowser/SadTab.qml	2015-09-02 16:48:16 +0000
@@ -0,0 +1,92 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import com.canonical.Oxide 1.8 as Oxide
++
++Rectangle {
++    property var webview
++
++    signal closeTabRequested()
++
++    Column {
++        anchors {
++            fill: parent
++            margins: units.gu(4)
++        }
++        spacing: units.gu(4)
++
++        Image {
++            anchors.horizontalCenter: parent.horizontalCenter
++            source: "assets/tab-error.png"
++        }
++
++        Label {
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
++
++            wrapMode: Text.Wrap
++            horizontalAlignment: Text.AlignHCenter
++            text: webview ? i18n.tr("The rendering process has been closed for this tab.") : ""
++        }
++
++        Label {
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
++
++            wrapMode: Text.Wrap
++            horizontalAlignment: Text.AlignHCenter
++            font.weight: Font.Light
++            text: {
++                if (!webview) {
++                    return ""
++                } else if (webview.webProcessStatus == Oxide.WebView.WebProcessCrashed) {
++                    // TRANSLATORS: %1 is the URL of the page that crashed the renderer process
++                    return i18n.tr("Something went wrong while displaying %1.").arg(webview.url)
++                } else if (webview.webProcessStatus == Oxide.WebView.WebProcessKilled) {
++                    return i18n.tr("The system is low on memory and can't display this webpage. Try closing unneeded tabs and reloading.")
++                } else {
++                    return ""
++                }
++            }
++        }
++
++        Row {
++            anchors.horizontalCenter: parent.horizontalCenter
++            spacing: units.gu(2)
++
++            Button {
++                objectName: "closeTabButton"
++                text: i18n.tr("Close tab")
++                onClicked: closeTabRequested()
++            }
++
++            Button {
++                objectName: "reloadButton"
++                text: i18n.tr("Reload")
++                color: UbuntuColors.green
++                onClicked: webview.reload()
++            }
++        }
++    }
++}
 === added file 'src/app/webbrowser/assets/tab-error@27.png'
 Binary files src/app/webbrowser/assets/tab-error@27.png	1970-01-01 00:00:00 +0000 and src/app/webbrowser/assets/tab-error@27.png	2015-09-02 16:48:16 +0000 differ
 === modified file 'src/app/webbrowser/tabs-model.cpp'
 --- src/app/webbrowser/tabs-model.cpp	2015-06-22 11:46:54 +0000
 +++ src/app/webbrowser/tabs-model.cpp	2015-09-02 16:48:16 +0000
@@ -154,10 +154,11 @@
          if (!checkValidTabIndex(index)) {
              m_currentIndex = m_tabs.count() - 1;
              Q_EMIT currentIndexChanged();
--            Q_EMIT currentTabChanged();
--        } else {
--            Q_EMIT currentTabChanged();
+         }
++        Q_EMIT currentTabChanged();
++    } else if (m_currentIndex > index) {
++        m_currentIndex -= 1;
++        Q_EMIT currentIndexChanged();
+     }
      return tab;
+ }
 === modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
 --- tests/autopilot/webbrowser_app/emulators/browser.py	2015-08-25 13:56:58 +0000
 +++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-09-02 16:48:16 +0000
@@ -109,6 +109,9 @@
      def get_error_sheet(self):
          return self.select_single("ErrorSheet")
++    def get_sad_tab(self):
++        return self.wait_select_single(SadTab)
++
      def get_suggestions(self):
          return self.select_single(Suggestions)
@@ -314,6 +317,19 @@
                        key=lambda item: item.globalRect.y)
++class SadTab(uitk.UbuntuUIToolkitCustomProxyObjectBase):
++
++    @autopilot.logging.log_action(logger.info)
++    def click_close_tab_button(self):
++        button = self.select_single("Button", objectName="closeTabButton")
++        self.pointing_device.click_object(button)
++
++    @autopilot.logging.log_action(logger.info)
++    def click_reload_button(self):
++        button = self.select_single("Button", objectName="reloadButton")
++        self.pointing_device.click_object(button)
++
++
  class GeolocationPermissionRequest(uitk.UbuntuUIToolkitCustomProxyObjectBase):
      def get_deny_button(self):
 === modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
 --- tests/autopilot/webbrowser_app/tests/__init__.py	2015-08-12 12:31:56 +0000
 +++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-09-02 16:48:16 +0000
@@ -18,11 +18,13 @@
  import os
  import shutil
++import signal
  import tempfile
  import time
  import urllib.request
  import fixtures
++import psutil
  from testtools.matchers import Equals, NotEquals
  from autopilot.matchers import Eventually
@@ -213,6 +215,15 @@
          ping = urllib.request.urlopen(url)
          self.assertThat(ping.read(), Equals(b"pong"))
++    def kill_web_processes(self, signal=signal.SIGKILL):
++        children = psutil.Process(self.app.pid).children(True)
++        for child in children:
++            if child.name() == 'oxide-renderer':
++                for arg in child.cmdline():
++                    if '--type=renderer' in arg:
++                        os.kill(child.pid, signal)
++                        break
++
  class StartOpenRemotePageTestCaseBase(BrowserTestCaseBase):
 === added file 'tests/autopilot/webbrowser_app/tests/test_sad_tab.py'
 --- tests/autopilot/webbrowser_app/tests/test_sad_tab.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/webbrowser_app/tests/test_sad_tab.py	2015-09-02 16:48:16 +0000
@@ -0,0 +1,74 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright 2015 Canonical
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 3, as published
++# by the Free Software Foundation.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++import signal
++import time
++
++from autopilot.platform import model
++
++from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
++
++
++class TestSadTab(StartOpenRemotePageTestCaseBase):
++
++    def _kill_web_process(self):
++        self.kill_web_processes()
++        # The first time the web process is killed, the browser attempts to
++        # reload the page gracefully (after a short delay), hoping the process
++        # won’t be killed again.
++        time.sleep(1)
++        self.main_window.wait_until_page_loaded(self.url)
++
++        self.kill_web_processes()
++        # The second time around, the browser displays a sad tab.
++        return self.main_window.get_sad_tab()
++
++    def test_reload_web_process_killed(self):
++        sad_tab = self._kill_web_process()
++        sad_tab.click_reload_button()
++        sad_tab.wait_until_destroyed()
++        self.assert_home_page_eventually_loaded()
++
++    def test_close_tab_web_process_killed(self):
++        sad_tab = self._kill_web_process()
++        sad_tab.click_close_tab_button()
++        if model() == 'Desktop':
++            # On desktop, closing the last open tab exits the application
++            self.app.process.wait()
++            return
++        sad_tab.wait_until_destroyed()
++        self.main_window.get_new_tab_view()
++
++    def _crash_web_process(self):
++        self.kill_web_processes(signal.SIGSEGV)
++        # A crash of the web process displays the sad tab right away
++        return self.main_window.get_sad_tab()
++
++    def test_reload_web_process_crashed(self):
++        sad_tab = self._crash_web_process()
++        sad_tab.click_reload_button()
++        sad_tab.wait_until_destroyed()
++        self.assert_home_page_eventually_loaded()
++
++    def test_close_tab_web_process_crashed(self):
++        sad_tab = self._crash_web_process()
++        sad_tab.click_close_tab_button()
++        if model() == 'Desktop':
++            # On desktop, closing the last open tab exits the application
++            self.app.process.wait()
++            return
++        sad_tab.wait_until_destroyed()
++        self.main_window.get_new_tab_view()
 === added file 'tests/unittests/qml/tst_WebProcessMonitor.qml'
 --- tests/unittests/qml/tst_WebProcessMonitor.qml	1970-01-01 00:00:00 +0000
 +++ tests/unittests/qml/tst_WebProcessMonitor.qml	2015-09-02 16:48:16 +0000
@@ -0,0 +1,108 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import QtTest 1.0
++import com.canonical.Oxide 1.8 as Oxide
++import "../../../src/app"
++
++WebProcessMonitor {
++    id: monitor
++
++    Item {
++        id: webviewMock
++
++        property int webProcessStatus
++
++        property int reloadCalled
++        function reload() {
++            webProcessStatus = Oxide.WebView.WebProcessRunning
++            reloadCalled++
++        }
++    }
++
++    TestCase {
++        name: "WebProcessMonitor"
++
++        function init() {
++            webviewMock.webProcessStatus = Oxide.WebView.WebProcessRunning
++            webviewMock.reloadCalled = 0
++        }
++
++        function test_no_webview() {
++            monitor.webview = null
++            compare(monitor.killedRetries, 0)
++            verify(!monitor.killed)
++            verify(!monitor.crashed)
++        }
++
++        function test_killed() {
++            monitor.webview = webviewMock
++            compare(monitor.killedRetries, 0)
++
++            webviewMock.webProcessStatus = Oxide.WebView.WebProcessKilled
++            verify(monitor.killed)
++            verify(!monitor.crashed)
++            tryCompare(monitor, "killedRetries", 1)
++            tryCompare(webviewMock, "reloadCalled", 1)
++            verify(!monitor.killed)
++            verify(!monitor.crashed)
++            compare(monitor.killedRetries, 1)
++
++            webviewMock.webProcessStatus = Oxide.WebView.WebProcessKilled
++            verify(monitor.killed)
++            verify(!monitor.crashed)
++            compare(monitor.killedRetries, 1)
++            compare(webviewMock.reloadCalled, 1)
++        }
++
++        function test_crashed() {
++            monitor.webview = webviewMock
++            compare(monitor.killedRetries, 0)
++
++            webviewMock.webProcessStatus = Oxide.WebView.WebProcessCrashed
++            verify(!monitor.killed)
++            verify(monitor.crashed)
++            compare(monitor.killedRetries, 0)
++            compare(webviewMock.reloadCalled, 0)
++
++            webviewMock.webProcessStatus = Oxide.WebView.WebProcessRunning
++            verify(!monitor.killed)
++            verify(!monitor.crashed)
++            compare(monitor.killedRetries, 0)
++            compare(webviewMock.reloadCalled, 0)
++        }
++
++        function test_change_webview() {
++            monitor.webview = webviewMock
++            compare(monitor.killedRetries, 0)
++            verify(!monitor.killed)
++            verify(!monitor.crashed)
++
++            webviewMock.webProcessStatus = Oxide.WebView.WebProcessKilled
++            verify(monitor.killed)
++            verify(!monitor.crashed)
++            tryCompare(monitor, "killedRetries", 1)
++
++            monitor.webview = null
++            compare(monitor.killedRetries, 0)
++            verify(!monitor.killed)
++            verify(!monitor.crashed)
++        }
++    }
++}
 === modified file 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'
 --- tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-08-10 15:22:00 +0000
 +++ tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-09-02 16:48:16 +0000
@@ -246,39 +246,62 @@
      void shouldUpdateCurrentTabWhenRemoving()
+     {
--        QSignalSpy spy(model, SIGNAL(currentTabChanged()));
++        QSignalSpy tabSpy(model, SIGNAL(currentTabChanged()));
++        QSignalSpy indexSpy(model, SIGNAL(currentIndexChanged()));
          // Adding a tab to an empty model should update the current tab.
          // Removing the last tab from the model should update it too.
          model->add(createTab());
++        tabSpy.clear();
++        indexSpy.clear();
          delete model->remove(0);
--        QCOMPARE(spy.count(), 2);
++        QCOMPARE(tabSpy.count(), 1);
++        QCOMPARE(indexSpy.count(), 1);
--        // When removing a tab after the current one,
--        // the current tab shouldn’t change.
++        // When removing a tab after the current one, neither the
++        // current tab nor the current index should change.
          QQuickItem* tab1 = createTab();
          model->add(tab1);
          model->add(createTab());
--        spy.clear();
++        tabSpy.clear();
++        indexSpy.clear();
          delete model->remove(1);
          QCOMPARE(model->currentTab(), tab1);
--        QVERIFY(spy.isEmpty());
++        QVERIFY(tabSpy.isEmpty());
++        QVERIFY(indexSpy.isEmpty());
--        // When removing the current tab, if there is a tab after it,
--        // it becomes the current one.
++        // When removing the current tab, if there is a tab after it, it
++        // becomes the current one, and thus the current index doesn’t change.
          QQuickItem* tab2 = createTab();
          model->add(tab2);
--        spy.clear();
++        tabSpy.clear();
++        indexSpy.clear();
          delete model->remove(0);
--        QCOMPARE(spy.count(), 1);
++        QCOMPARE(tabSpy.count(), 1);
++        QVERIFY(indexSpy.isEmpty());
          QCOMPARE(model->currentTab(), tab2);
++        // When removing a tab before the current one, the current
++        // tab doesn’t change but the current index is updated.
++        QQuickItem* tab3 = createTab();
++        model->add(tab3);
++        model->setCurrentIndex(1);
++        tabSpy.clear();
++        indexSpy.clear();
++        delete model->remove(0);
++        QVERIFY(tabSpy.isEmpty());
++        QCOMPARE(indexSpy.count(), 1);
++        QCOMPARE(model->currentIndex(), 0);
++
          // When removing the current tab, if it was the last one, the
          // current tab should be reset to 0.
--        spy.clear();
++        tabSpy.clear();
++        indexSpy.clear();
          delete model->remove(0);
--        QCOMPARE(spy.count(), 1);
++        QCOMPARE(tabSpy.count(), 1);
++        QCOMPARE(indexSpy.count(), 1);
          QCOMPARE(model->currentTab(), (QObject*) nullptr);
++        QCOMPARE(model->currentIndex(), -1);
+     }
      void shouldReturnData()

webbrowser-app

Merge lp:~osomon/webbrowser-app/webProcessStatus into lp:webbrowser-app

Commit message

Description of the change

Preview Diff

Subscribers