Merge lp:~mandel/ubuntu-download-manager/remove-after-process into lp:ubuntu-download-manager

[Manuel de la Peña]

Remove the file after the successful execution of the post-download command line.

Remove the file after the successful execution of the post-download command line.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/remove-after-process]

149. By Manuel de la Peña on 2013-10-09

Fix missing var.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-download-manager-ci/101/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/remove-after-process]

150. By Manuel de la Peña on 2013-10-09

Fix broken tests.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-download-manager-ci/102/rebuild

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/single_download.cpp'
--- libubuntudownloadmanager/single_download.cpp	2013-09-25 12:17:16 +0000
+++ libubuntudownloadmanager/single_download.cpp	2013-10-09 18:58:40 +0000
@@ -352,6 +352,10 @@
         qDebug() << __PRETTY_FUNCTION__ << exitCode << exitStatus;
         Q_Q(SingleDownload);
         if (exitCode == 0 && exitStatus == QProcess::NormalExit) {
+            // remove the file since we are done with it
+            bool success = QFile::remove(_filePath);
+            if (!success)
+                qWarning() << "Error removing" << _filePath;
             q->setState(Download::FINISH);
             qDebug() << "EMIT finished" << filePath();
             emit q->finished(filePath());

=== modified file 'ubuntu-download-manager-tests/test_download.cpp'
--- ubuntu-download-manager-tests/test_download.cpp	2013-09-30 11:07:20 +0000
+++ ubuntu-download-manager-tests/test_download.cpp	2013-10-09 18:58:40 +0000
@@ -1550,6 +1550,52 @@
 }
 
 void
+TestDownload::testFileRemoveAfterSuccessfulProcess() {
+    // assert that the file is indeed removed
+    QVariantMap metadata;
+    QStringList command;
+    command << "grep" << "$file" << "-Rn";
+    metadata["post-download-command"] = command;
+
+    _processFactory->record();
+    _reqFactory->record();
+    SingleDownload* download = new SingleDownload(_id, _path, _isConfined,
+        _rootPath, _url, metadata, _headers,
+        QSharedPointer<SystemNetworkInfo>(_networkInfo),
+        QSharedPointer<RequestFactory>(_reqFactory),
+        QSharedPointer<ProcessFactory>(_processFactory));
+
+    // write something in the expected file
+    QString fileName = download->filePath();
+    QFile* file = new QFile(fileName);
+    file->open(QIODevice::ReadWrite | QFile::Append);
+    file->write("my data goes here");
+    file->close();
+
+    download->start();  // change state
+    download->startDownload();
+
+    // we need to set the data before we pause!!!
+    QList<MethodData> calledMethods = _reqFactory->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    FakeNetworkReply* reply = reinterpret_cast<FakeNetworkReply*>(
+        calledMethods[0].params().outParams()[0]);
+
+    // makes the process to be executed
+    reply->emitFinished();
+
+    calledMethods = _processFactory->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    FakeProcess* process = reinterpret_cast<FakeProcess*>(
+        calledMethods[0].params().outParams()[0]);
+
+    // emit the finished signal with a result > 0 and ensure error is emitted
+    process->emitFinished(0, QProcess::NormalExit);
+    // asser that the file does not longer exist in the system
+    QVERIFY(!QFile::exists(fileName));
+}
+
+void
 TestDownload::testSetRawHeaderAcceptEncoding_data() {
     QTest::addColumn<QMap<QString, QString> >("headers");
 

=== modified file 'ubuntu-download-manager-tests/test_download.h'
--- ubuntu-download-manager-tests/test_download.h	2013-09-25 12:17:16 +0000
+++ ubuntu-download-manager-tests/test_download.h	2013-10-09 18:58:40 +0000
@@ -111,6 +111,7 @@
     void testProcessFinishedNoError();
     void testProcessFinishedWithError();
     void testProcessFinishedCrash();
+    void testFileRemoveAfterSuccessfulProcess();
 
     // test related to bug #1224678
     void testSetRawHeaderAcceptEncoding_data();