diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-26 13:32:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-27 09:22:35 +0000 |
| commit | 709c4a9c065a2a96f601c99374d7ce555226749f (patch) | |
| tree | aebe1d6797346bb62e0023352fda3ff651ce3cba /tests | |
| parent | 829066432f92946fb0d26d8134bd4a9209fb5fe4 (diff) | |
lconvert test: Try to avoid QProcess::waitForFinished() timeouts
Add a test for QProcess::waitForStarted() to separate out the startup time
and catch startup errors, trying to avoid errors like:
FAIL! : tst_lconvert::readverifies(kde context) 'cvt->waitForFinished(3000)' returned FALSE. (Process 1 hung)
tst_lconvert.cpp(81) : failure location
Change-Id: I8c23eae7255b39b6a7a7dc77b520fcb6c7d5e642
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/linguist/lconvert/tst_lconvert.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp index 7f3c60f51..eb5367b55 100644 --- a/tests/auto/linguist/lconvert/tst_lconvert.cpp +++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp @@ -141,6 +141,7 @@ void tst_lconvert::verifyReadFail(const QString &fn) { QProcess cvt; cvt.start(lconvert, QStringList() << (dataDir + fn)); + QVERIFY2(cvt.waitForStarted(), qPrintable(cvt.errorString())); QVERIFY(cvt.waitForFinished(10000)); QVERIFY(cvt.exitStatus() == QProcess::NormalExit); QVERIFY2(cvt.exitCode() == 2, "Accepted invalid input"); @@ -169,6 +170,8 @@ void tst_lconvert::convertChain(const QString &_inFileName, const QString &_outF args << "-if" << stations[i] << "-i" << "-" << "-of" << stations[i + 1]; cvts.at(i)->start(lconvert, args, QIODevice::ReadWrite | QIODevice::Text); } + for (QProcess *cvt : qAsConst(cvts)) + QVERIFY2(cvt->waitForStarted(), qPrintable(cvt->errorString())); int st = 0; foreach (QProcess *cvt, cvts) doWait(cvt, ++st); @@ -236,6 +239,7 @@ void tst_lconvert::converts() cvt.start(lconvert, QStringList() << "-i" << (dataDir + inFileName) << "-of" << format, QIODevice::ReadWrite | QIODevice::Text); + QVERIFY2(cvt.waitForStarted(), qPrintable(cvt.errorString())); doWait(&cvt, 0); if (QTest::currentTestFailed()) return; |