From 1cbf402ea67f78411444427f33787b1df376468b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 14 Feb 2017 14:51:47 +0100 Subject: [PATCH] tst_QMimeDatabase: increase timeout The runUpdateMimeDatabase() call was timing out on the CI due to running out of the default 30s timeout for QProcess::waitForFinished() (on my machine, that call takes less than 0.5s, reliably...). Increase to two minutes. Change-Id: I61b2e060ea9c2508b853847ba7040ad499e0084c Reviewed-by: Friedemann Kleint Reviewed-by: David Faure --- .../corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 2cf9ea4913b..8058d3c8973 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -858,6 +858,11 @@ void tst_QMimeDatabase::fromThreads() } #ifndef QT_NO_PROCESS + +enum { + UpdateMimeDatabaseTimeout = 120 * 1000 // 2min +}; + static bool runUpdateMimeDatabase(const QString &path) // TODO make it a QMimeDatabase method? { const QString umdCommand = QString::fromLatin1("update-mime-database"); @@ -878,7 +883,7 @@ static bool runUpdateMimeDatabase(const QString &path) // TODO make it a QMimeDa qPrintable(umd), qPrintable(proc.errorString())); return false; } - const bool success = proc.waitForFinished(); + const bool success = proc.waitForFinished(UpdateMimeDatabaseTimeout); qDebug().noquote() << "runUpdateMimeDatabase: done," << success << timer.elapsed() << "ms"; return true;