From 599dbc5e43174a3b27c43fabdc6c0d441253d497 Mon Sep 17 00:00:00 2001 From: Alex Trotsenko Date: Sat, 30 Jan 2016 15:47:42 +0200 Subject: Stabilize tst_QProcess::softExitInSlots() After the commit 7ff655360f, case 4 in SoftExitProcess class relates to a channelReadyRead() signal instead of stateChanged(). Accordingly, terminateSlot() is fixed to handle a special case when process is not running. Change-Id: Ie0d3284f5d264037d00e4ad6d927c0766be562b0 Reviewed-by: Oswald Buddenhagen --- tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/corelib/io') diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 43a9c53de2..0d690312e4 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -1012,8 +1012,8 @@ public: public slots: void terminateSlot() { - writePendingData(); // In cases 3 and 4 we haven't written the data yet. - if (killing || (n == 4 && state() != Running)) { + writePendingData(); // In cases 3 and 5 we haven't written the data yet. + if (killing || (n == 5 && state() != Running)) { // Don't try to kill the process before it is running - that can // be hazardous, as the actual child process might not be running // yet. Also, don't kill it "recursively". -- cgit v1.2.3