AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lower timeout on tst_QSemaphore::tryAcquireWithTimeout

Browse Source 
The test was so slow it was blacklisted on all platforms for timing out.
This patch lowers the timeout to a 5th and tries removing the blacklist.

Change-Id: Ib28b21de572517c548a14300f26815598efe91e2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Allan Sandfeld Jensen 2016-12-09 11:23:04 +01:00
parent 311e523cef
commit b750a3786f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/thread/qsemaphore/BLACKLIST
View File

@ -1,3 +0,0 @@
# Times out randomly on linux, windows, osx
[tryAcquireWithTimeout]
*

6
tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
View File

@ -202,8 +202,8 @@ void tst_QSemaphore::tryAcquireWithTimeout_data()
{
QTest::addColumn<int>("timeout");
QTest::newRow("1s") << 1000;
QTest::newRow("10s") << 10000;
QTest::newRow("0.2s") << 200;
QTest::newRow("2s") << 2000;
}
void tst_QSemaphore::tryAcquireWithTimeout()
@ -212,7 +212,7 @@ void tst_QSemaphore::tryAcquireWithTimeout()
// timers are not guaranteed to be accurate down to the last millisecond,
// so we permit the elapsed times to be up to this far from the expected value.
int fuzz = 50;
int fuzz = 50 + (timeout / 20);
QSemaphore semaphore;
QElapsedTimer time;