1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Make timeout in tst_QApplication::abortQuitOnShow() longer

Browse Source 
Since the Android emulator on CI is running without hardware accelerated
graphics, showing the widget can take almost the same time as the timeout
for exiting the app with the "wrong" exit code 1. If running on Android,
increase the timeout to 1000 ms to avoid flaky failures. Un-blacklist
tst_QApplication::abortQuitOnShow() since the random failures are
taken care of by this patch.

Task-number: QTBUG-122693
Change-Id: Id52ae15b3ab2dbdaf4924b675276dfe3a4168585
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 32197e94d79f9bb00ddb9c294bd2711dba47d1ee)
This commit is contained in:
Tinja Paavoseppä 2024-02-27 13:16:16 +02:00
parent a405320544
commit e5a8b36704
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/widgets/kernel/qapplication/BLACKLIST
View File

@ -1,7 +1,3 @@
[touchEventPropagation]
# QTBUG-66745
opensuse-leap
[abortQuitOnShow]
# QTBUG-122693
android

8
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -2576,7 +2576,13 @@ public:
: QWidget(parent), showAgain(showAgain)
{
QTimer::singleShot(0, this, &ShowCloseShowWidget::doClose);
QTimer::singleShot(500, this, [] () { QCoreApplication::exit(1); });
int timeout = 500;
#ifdef Q_OS_ANDROID
// On Android, CI Android emulator is not running HW accelerated graphics and can be slow,
// use a longer timeout to avoid flaky failures
timeout = 1000;
#endif
QTimer::singleShot(timeout, this, [] () { QCoreApplication::exit(1); });
}
private slots: