Merge lp:~mandel/ubuntu-download-manager/continue-after-chechsum-error into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that when there is a hash error the state change is emitted and is the correct download state.

Ensure that when there is a hash error the state change is emitted and is the correct download state.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/46

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/55/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~mandel/ubuntu-download-manager/continue-after-chechsum-error]

125. By Manuel de la Peña on 2013-09-19

Increase debuging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/continue-after-chechsum-error]

126. By Manuel de la Peña on 2013-09-19

Import QSslError

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/48

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/57/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'libubuntudownloadmanager/single_download.cpp'
--- libubuntudownloadmanager/single_download.cpp	2013-09-18 12:24:49 +0000
+++ libubuntudownloadmanager/single_download.cpp	2013-09-19 15:34:47 +0000
@@ -22,6 +22,7 @@
 #include <QStringList>
 #include <QFile>
 #include <QFileInfo>
+#include <QSslError>
 #include "./single_download.h"
 #include "./network_reply.h"
 #include "./xdg_basedir.h"
@@ -264,8 +265,7 @@
                 QCryptographicHash::hash(data, _algo).toHex());
             if (fileSig != _hash) {
                 qCritical() << "HASH ERROR:" << fileSig << "!=" << _hash;
-                q->setState(Download::FINISH);
-                emit q->error("HASH ERROR");
+                emitError("HASH ERROR");
                 return;
             }
         }
@@ -282,8 +282,7 @@
             if (commandData.count() == 0) {
                 // raise error, command metadata was passed without the commnad
                 qCritical() << "COMMAND DATA MISSING";
-                q->setState(Download::FINISH);
-                emit q->error("COMMAND ERROR");
+                emitError("COMMAND ERROR");
                 return;
             } else {
                 // first item of the string list is the commnad
@@ -328,9 +327,9 @@
 
     void onSslErrors(const QList<QSslError>& errors) {
         qDebug() << __PRETTY_FUNCTION__ << _url;
+        qDebug() << "Found errors" << errors;
         Q_UNUSED(errors);
-        Q_Q(SingleDownload);
-        emit q->error("SSL ERROR");
+        emitError("SSL ERROR");
     }
 
     // slots executed to keep track of the post download process

=== modified file 'ubuntu-download-manager-tests/test_download.cpp'
--- ubuntu-download-manager-tests/test_download.cpp	2013-09-18 12:39:37 +0000
+++ ubuntu-download-manager-tests/test_download.cpp	2013-09-19 15:34:47 +0000
@@ -896,7 +896,7 @@
         QSharedPointer<SystemNetworkInfo>(_networkInfo),
         QSharedPointer<RequestFactory>(_reqFactory),
         QSharedPointer<ProcessFactory>(_processFactory));
-    QSignalSpy spy(download , SIGNAL(error(QString)));
+    QSignalSpy errorSpy(download , SIGNAL(error(QString)));
 
     download->start();  // change state
     download->startDownload();
@@ -919,11 +919,16 @@
     calledMethods = _reqFactory->calledMethods();
     reply = reinterpret_cast<FakeNetworkReply*>(
         calledMethods[0].params().outParams()[0]);
+
+    // create the spy here else we will register other not interesting
+    // signals
+    QSignalSpy stateSpy(download , SIGNAL(stateChanged()));
     emit reply->finished();
 
     // the has is a random string so we should get an error signal
-    QCOMPARE(spy.count(), 1);
-    QCOMPARE(download->state(), Download::FINISH);
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(stateSpy.count(), 1);
+    QCOMPARE(download->state(), Download::ERROR);
 
     delete download;
 }