Merge lp:~mandel/ubuntu-download-manager/skip-on-daemon-errors into lp:ubuntu-download-manager

[Manuel de la Peña]

If we have issues setting up the diff daemons for the integrations tests we should skip the test and not fail because it is giving false negatives in the jekins bots.

[Ricardo Mendoza (ricmm)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/629/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/518

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/skip-on-daemon-errors]

253. By Manuel de la Peña on 2014-04-29

Merged all-downloads-client into skip-on-daemon-errors.

254. By Manuel de la Peña on 2014-04-29

Merged all-downloads-client into skip-on-daemon-errors.

255. By Manuel de la Peña on 2014-04-30

Merged all-downloads-client into skip-on-daemon-errors.

=== modified file 'tests/daemon_testcase.cpp'
--- tests/daemon_testcase.cpp	2014-04-01 11:56:30 +0000
+++ tests/daemon_testcase.cpp	2014-05-07 09:01:41 +0000
@@ -51,7 +51,7 @@
         QString filename(fileInfo.fileName());
         serverFile.copy(httpServerDir() + "/" + filename);
     } else {
-        QFAIL(QString("File '%1' does not exist.").arg(absolutePath).toUtf8());
+        QSKIP(QString("File '%1' does not exist.").arg(absolutePath).toUtf8(), SkipSingle);
     }
 }
 
@@ -81,7 +81,7 @@
 	    auto error = reply.error();
 	    QString msg = "Could not tell the daemon to return DBus errors: "
                 + error.name() + ":" +  error.message();
-            QFAIL(msg.toUtf8());
+            QSKIP(msg.toUtf8(), SkipSingle);
         }
     } else {
         QFAIL("returnDBusErrors must be used after init has been executed.");
@@ -102,7 +102,7 @@
 	    auto error = reply.error();
 	    QString msg = "Could not tell the daemon to return Auth errors: "
                 + error.name() + ":" +  error.message();
-            QFAIL(msg.toUtf8());
+            QSKIP(msg.toUtf8(), SkipSingle);
         }
     } else {
         QFAIL("returnHttpError must be used after init has been executed.");
@@ -123,7 +123,7 @@
 	    auto error = reply.error();
 	    QString msg = "Could not tell the daemon to return Http errors: "
                 + error.name() + ":" +  error.message();
-            QFAIL(msg.toUtf8());
+            QSKIP(msg.toUtf8(), SkipSingle);
         }
     } else {
         QFAIL("returnHttpError must be used after init has been executed.");
@@ -145,7 +145,7 @@
 	    auto error = reply.error();
 	    QString msg = "Could not tell the daemon to return Network errors: "
                 + error.name() + ":" +  error.message();
-            QFAIL(msg.toUtf8());
+            QSKIP(msg.toUtf8(), SkipSingle);
         }
     } else {
         QFAIL("returnNetworkError must be used after init has been executed.");
@@ -167,7 +167,7 @@
 	    auto error = reply.error();
 	    QString msg = "Could not tell the daemon to return Process errors: "
                 + error.name() + ":" +  error.message();
-            QFAIL(msg.toUtf8());
+            QSKIP(msg.toUtf8(), SkipSingle);
         }
     } else {
         QFAIL("returnProcessError must be used after init has been executed.");
@@ -251,7 +251,7 @@
 DaemonTestCase::onProcessError(QProcess::ProcessError error) {
     qDebug() << error << _daemonProcess->readAllStandardError()
         << _daemonProcess->readAllStandardOutput();
-    QFAIL("Process could not be started.");
+    QSKIP("Process could not be started.", SkipSingle);
 }
 
 void