diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-03-17 21:09:52 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-03-22 12:35:09 +0000 |
| commit | e328218dfefc898762db4f9c37b44c61eb8d30e1 (patch) | |
| tree | 50662a29713e510899ea690dccbbdc0a2d9d4042 | |
| parent | 0f03296391b58edbaa7e779f580adc3075aff831 (diff) | |
tst_QMimeDatabase: increase update-mime-database timeout to 4mins
in the vain hope to get the CI unstuck again.
Change-Id: I1b01bb1d59a8850f68d1d80838f5606f4159bcbd
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
(cherry picked from commit 1b73d1397555b99385c03eba8b5e6347b49d27f9)
Reviewed-by: David Faure <david.faure@kdab.com>
| -rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 9ca7e0001a..42409ad58a 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -864,6 +864,11 @@ void tst_QMimeDatabase::fromThreads() } #ifndef QT_NO_PROCESS + +enum { + UpdateMimeDatabaseTimeout = 4 * 60 * 1000 // 4min +}; + static bool runUpdateMimeDatabase(const QString &path) // TODO make it a QMimeDatabase method? { const QString umdCommand = QString::fromLatin1("update-mime-database"); @@ -884,7 +889,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; |