diff options
| author | Tinja Paavoseppä <tinja.paavoseppa@qt.io> | 2024-02-27 13:16:16 +0200 |
|---|---|---|
| committer | Tinja Paavoseppä <tinja.paavoseppa@qt.io> | 2024-02-27 17:28:19 +0000 |
| commit | 32197e94d79f9bb00ddb9c294bd2711dba47d1ee (patch) | |
| tree | fea8e47fb60d490dbdff31b18943cf13224082d2 | |
| parent | f429f12a7fb94ef5970a28eaf0b53aea935044b3 (diff) | |
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>
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/BLACKLIST b/tests/auto/widgets/kernel/qapplication/BLACKLIST index bf6ece58fcc..c68c7d6b149 100644 --- a/tests/auto/widgets/kernel/qapplication/BLACKLIST +++ b/tests/auto/widgets/kernel/qapplication/BLACKLIST @@ -1,7 +1,3 @@ [touchEventPropagation] # QTBUG-66745 opensuse-leap - -[abortQuitOnShow] -# QTBUG-122693 -android diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 52fdc63e08a..7c2091186c9 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -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; |