From 5a3bbb55851b84aa6a46c23e5a6fb33b4860edc6 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 24 Feb 2021 14:58:09 +0100 Subject: tst_QFuture::continuationsWithContext: fix the flakiness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When attaching a continuation with the default (QtFuture::Launch::Sync) policy, it will be launched in the same thread where the parent has been executing, or in the thread where the parent lives, if the continuation is attached after the parent has already finished. Fixed the test-case to make sure the continuations are attached while the parent is still running, so that they can be resolved in the parent's context. Fixes: QTBUG-91373 Pick-to: 6.1 Change-Id: I82b3b0c47b76d121b44bd512659c08b3b474e351 Reviewed-by: Ivan Solovev Reviewed-by: Jarek Kobus Reviewed-by: MÃ¥rten Nordheim --- tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index ac7564f36a..71cfbd054b 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -2837,7 +2837,8 @@ void tst_QFuture::continuationsWithContext() // .then() { - auto future = QtFuture::makeReadyFuture(0) + QPromise promise; + auto future = promise.future() .then([&](int val) { if (QThread::currentThread() != tstThread) return 0; @@ -2854,12 +2855,16 @@ void tst_QFuture::continuationsWithContext() return 0; return val + 1; }); + promise.start(); + promise.addResult(0); + promise.finish(); QCOMPARE(future.result(), 3); } // .onCanceled { - auto future = createCanceledFuture() + QPromise promise; + auto future = promise.future() .onCanceled(context, [&] { if (QThread::currentThread() != &thread) @@ -2871,13 +2876,17 @@ void tst_QFuture::continuationsWithContext() return 0; return val + 1; }); + promise.start(); + promise.future().cancel(); + promise.finish(); QCOMPARE(future.result(), 2); } #ifndef QT_NO_EXCEPTIONS // .onFaled() { - auto future = QtFuture::makeReadyFuture() + QPromise promise; + auto future = promise.future() .then([&] { if (QThread::currentThread() != tstThread) return 0; @@ -2894,6 +2903,8 @@ void tst_QFuture::continuationsWithContext() return 0; return val + 1; }); + promise.start(); + promise.finish(); QCOMPARE(future.result(), 2); } #endif // QT_NO_EXCEPTIONS -- cgit v1.2.3