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

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
Pick-to: 6.7
Change-Id: Id52ae15b3ab2dbdaf4924b675276dfe3a4168585
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
bb10
Tinja Paavoseppä 2024-02-27 13:16:16 +02:00
parent f429f12a7f
commit 32197e94d7
2 changed files with 7 additions and 5 deletions

View File

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

View File

@ -2574,7 +2574,13 @@ public:
explicit ShowCloseShowWidget(bool showAgain, QWidget *parent = nullptr)
: QWidget(parent), showAgain(showAgain)
{
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); });
}
bool shown = false;