Tests: Omit waiting for client process indefinitely

hluk · Aug 20, 2017 · 649bffd · 649bffd
1 parent 6e48f48
commit 649bffd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/tests/test_utils.h b/src/tests/test_utils.h
@@ -97,6 +97,9 @@ const int waitMsSetClipboard = 1000;
 /// Interval to wait (in ms) before getting clipboard.
 const int waitMsGetClipboard = 100;
 
+/// Interval to wait (in ms) for client process.
+const int waitClientRun = 30000;
+
 using Args = QStringList;
 
 inline QByteArray toByteArray(const QString &text)

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -262,6 +262,7 @@ class TestInterfaceImpl : public TestInterface {
         if (stderrData != nullptr)
             stderrData->clear();
 
+        SleepTimer t(waitClientRun);
         while ( p.state() == QProcess::Running ) {
             const auto out = p.readAllStandardOutput();
             const auto err = p.readAllStandardError();
@@ -271,7 +272,10 @@ class TestInterfaceImpl : public TestInterface {
             if (stderrData != nullptr)
                 stderrData->append(err);
 
-            QCoreApplication::processEvents();
+            if ( !t.sleep() ) {
+                qWarning() << "client process timed out";
+                return -1;
+            }
         }
 
         if (stderrData != nullptr) {