Merge lp:~unity-team/libqtdbustest/handle-crashing-child-process into lp:libqtdbustest

[Pete Woods]

Correctly handle crashing child processes

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
  * Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
  * Yes
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
  * Yes
 * Has your component "TestPlan” been executed successfully on emulator, N4?
  * Yes
 * Has a 5 minute exploratory testing run been executed on N4?
  * Yes
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
  * N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
  * No change
 * What components might get impacted by your changes?
  * Unity7
  * Unity8
 * Have you requested review by the teams of these owning components?
  * Yes

Check List:
https://wiki.ubuntu.com/Process/Merges/Checklists/libqtdbustest

Test Plan:
https://wiki.ubuntu.com/Process/Merges/TestPlan/libqtdbustest

Silo:
<waiting for silo>

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/libqtdbustest-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libqtdbustest-ci/21/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'src/qdbus-test-runner/qdbus-simple-test-runner.cpp'
--- src/qdbus-test-runner/qdbus-simple-test-runner.cpp	2013-11-13 10:13:18 +0000
+++ src/qdbus-test-runner/qdbus-simple-test-runner.cpp	2014-03-18 17:21:56 +0000
@@ -32,7 +32,10 @@
 Q_OBJECT
 
 public Q_SLOTS:
-	void finished(int exitCode) {
+	void finished(int exitCode, QProcess::ExitStatus exitStatus) {
+		if (exitStatus == QProcess::CrashExit && exitCode == 0) {
+			exitCode = 1;
+		}
 		QCoreApplication::exit(exitCode);
 	}
 };
@@ -65,9 +68,9 @@
 	runner.startServices();
 
 	ExitListener listener;
-	QObject::connect(&service->underlyingProcess(), SIGNAL(finished(int)),
-			&listener,
-			SLOT(finished(int)));
+	QObject::connect(&service->underlyingProcess(),
+			SIGNAL(finished(int, QProcess::ExitStatus)), &listener,
+			SLOT(finished(int, QProcess::ExitStatus)));
 
 	return application.exec();
 }