Merge lp:~osomon/webbrowser-app/shouldCancelRequests-handle-errors into lp:webbrowser-app

[Olivier Tilloy]

Handle RemoteHostClosedError in shouldCancelRequests().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1081
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1081/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4537
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4537/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24044

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2331/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4544/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1085
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1085
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3687/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4541
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4541/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24053

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1086
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1086/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4544
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24060

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4553
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1088
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1088
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1088/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1088
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4550
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4550/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24073

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

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

Complicated issue, but from the way I understand it the solution seems to make sense.
Assuming that all errors happen, if they do happen, before 500ms sounds safe enough, as these things go.
Jenkins is also happy, therefore approving, as I can't think of cases when this will make things worse than they already are anyway.

review: Approve

=== modified file 'tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp'
--- tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-09-21 19:41:22 +0000
+++ tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-10-07 17:51:27 +0000
@@ -52,7 +52,9 @@
 public:
     TestHTTPServer(QObject* parent = 0)
         : QTcpServer(parent)
-    {}
+    {
+        connect(this, SIGNAL(newConnection()), SLOT(onNewConnection()));
+    }
 
     QString baseURL() const
     {
@@ -61,17 +63,18 @@
 
 Q_SIGNALS:
     void gotRequest(const QString& path) const;
+    void gotError() const;
 
-protected:
-    void incomingConnection(qintptr socketDescriptor)
-    {
-        QTcpSocket* socket = new QTcpSocket(this);
-        connect(socket, SIGNAL(readyRead()), SLOT(readClient()));
-        connect(socket, SIGNAL(disconnected()), SLOT(discardClient()));
-        socket->setSocketDescriptor(socketDescriptor);
+private Q_SLOTS:
+    void onNewConnection() {
+        if (hasPendingConnections()) {
+            QTcpSocket* socket = nextPendingConnection();
+            connect(socket, SIGNAL(readyRead()), SLOT(readClient()));
+            connect(socket, SIGNAL(disconnected()), SLOT(discardClient()));
+            connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SIGNAL(gotError()));
+        }
     }
 
-private Q_SLOTS:
     void readClient()
     {
         QTcpSocket* socket = qobject_cast<QTcpSocket*>(sender());
@@ -141,6 +144,7 @@
     QSignalSpy* fetcherSpy;
     TestHTTPServer* server;
     QSignalSpy* serverSpy;
+    QSignalSpy* errorSpy;
 
 private Q_SLOTS:
     void init()
@@ -154,10 +158,12 @@
         server = new TestHTTPServer;
         server->listen();
         serverSpy = new QSignalSpy(server, SIGNAL(gotRequest(const QString&)));
+        errorSpy = new QSignalSpy(server, SIGNAL(gotError()));
     }
 
     void cleanup()
     {
+        delete errorSpy;
         delete serverSpy;
         delete server;
         delete fetcherSpy;
@@ -278,14 +284,17 @@
     void shouldCancelRequests()
     {
         // Issue several requests rapidly in succession, and verify that
-        // all the previous ones are discarded
-        for (int i = 1; i < 10; ++i) {
+        // all the previous ones are discarded. Take into account possible
+        // errors (see https://launchpad.net/bugs/1498539).
+        int requests = 100;
+        int errors = 0;
+        for (int i = 1; i <= requests; ++i) {
             QUrl url(server->baseURL() + "/favicon" + QString::number(i) + ".ico");
             fetcher->setUrl(url);
-            QVERIFY(serverSpy->wait());
+            QVERIFY(serverSpy->wait(500) || (errorSpy->count() == ++errors));
         }
         QVERIFY(fetcherSpy->wait());
-        QCOMPARE(serverSpy->count(), 9);
+        QCOMPARE(serverSpy->count() + errorSpy->count(), requests);
         QCOMPARE(fetcherSpy->count(), 1);
     }
 };