From f66f2d2a202b32a703e2719e7eb91ee4d681220c Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Fri, 20 Jan 2012 14:13:09 +0100
Subject: make tst_QProcess::softExitInSlots pass in under 120 seconds

Due to unconditional waits this test always needed 120 seconds to pass.
Now we're using QTRY_VERIFY and make sure that we write the data before
the process got killed even in the cases 3 and 4.

Change-Id: I4718f2a4f3e53921716c639ae8041114234e9086
Reviewed-by: Bill King <bill.king@nokia.com>
---
 tests/auto/qprocess/tst_qprocess.cpp | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'tests/auto/qprocess')

diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index 97ab85e328..978cf0c0cd 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-
+#include "../../shared/util.h"
 #include <QtTest/QtTest>
 #include <QtCore/QProcess>
 #include <QtCore/QDir>
@@ -1117,9 +1117,21 @@ public:
         }
     }
 
+    void writeAfterStart(const char *buf, int count)
+    {
+        dataToWrite = QByteArray(buf, count);
+    }
+
+    void start(const QString &program)
+    {
+        QProcess::start(program);
+        writePendingData();
+    }
+
 public slots:
     void terminateSlot()
     {
+        writePendingData(); // In cases 3 and 4 we haven't written the data yet.
         if (killing || (n == 4 && 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
@@ -1141,9 +1153,19 @@ public slots:
         waitedForFinished = true;
     }
 
+private:
+    void writePendingData()
+    {
+        if (!dataToWrite.isEmpty()) {
+            write(dataToWrite);
+            dataToWrite.clear();
+        }
+    }
+
 private:
     int n;
     bool killing;
+    QByteArray dataToWrite;
 };
 
 //-----------------------------------------------------------------------------
@@ -1177,11 +1199,10 @@ void tst_QProcess::softExitInSlots()
 
     for (int i = 0; i < 5; ++i) {
         SoftExitProcess proc(i);
+        proc.writeAfterStart("OLEBOLE", 8); // include the \0
         proc.start(appName);
-        proc.write("OLEBOLE", 8); // include the \0
-        QTestEventLoop::instance().enterLoop(10);
+        QTRY_VERIFY(proc.waitedForFinished);
         QCOMPARE(proc.state(), QProcess::NotRunning);
-        QVERIFY(proc.waitedForFinished);
     }
 }
 
-- 
cgit v1.2.3