diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2015-02-12 15:24:40 +0300 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-02-12 17:09:39 +0000 |
| commit | 04df1532c412cb62db033865055d14dfe3ec7b71 (patch) | |
| tree | c7e64b3de89b024b9d57c9bd9b74464f2630cc86 | |
| parent | e1ea84b740fb54bf7a60e852f68dd5a126da0104 (diff) | |
Increase tests timeout to make them succeed on slow hardware
In Debian, QBS failed to build on some architectures (like MIPS) due
to timeout error in tests. Increasing the timeout made the tests succeed.
See https://bugs.debian.org/774974 for details.
Done-with: Dejan Latinovic <Dejan.Latinovic@imgtec.com>
Change-Id: I68b24260eefd1cb5cb6486f71a4cd9e9e2f3d2f2
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 8f1240715..ba3495267 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -576,7 +576,7 @@ void TestApi::infiniteLoopBuilding() qbs::Project project = setupJob->project(); const QScopedPointer<qbs::BuildJob> buildJob(project.buildAllProducts(qbs::BuildOptions())); QTimer::singleShot(1000, buildJob.data(), SLOT(cancel())); - QVERIFY(waitForFinished(buildJob.data(), 300000)); + QVERIFY(waitForFinished(buildJob.data(), 600000)); } void TestApi::infiniteLoopBuilding_data() @@ -595,7 +595,7 @@ void TestApi::infiniteLoopResolving() QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams, m_logSink, 0)); QTimer::singleShot(1000, setupJob.data(), SLOT(cancel())); - QVERIFY(waitForFinished(setupJob.data(), 300000)); + QVERIFY(waitForFinished(setupJob.data(), 600000)); QVERIFY2(setupJob->error().toString().toLower().contains("cancel"), qPrintable(setupJob->error().toString())); } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 197eed341..62c8a4dcd 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -106,7 +106,7 @@ int TestBlackbox::runQbs(const QbsRunParameters ¶ms) QProcess process; process.setProcessEnvironment(params.environment); process.start(cmdLine); - const int waitTime = 5 * 60000; + const int waitTime = 10 * 60000; if (!process.waitForStarted() || !process.waitForFinished(waitTime)) { m_qbsStderr = process.readAllStandardError(); if (!params.expectFailure) |