Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make RuntimeScheduler tests less flaky (#39353)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/39353

changelog: [internal]

Increase the wait threshold when waiting for a task in a stub queue to reduce test flakyness.

Reviewed By: makovkastar

Differential Revision: D49093046

fbshipit-source-id: 30d150f421c226587ae9e41786d2d0f95c82dfef
This commit is contained in:
Samuel Susla
2023-09-09 05:43:50 -07:00
committed by Facebook GitHub Bot
parent 9841bd8185
commit 17ecae9ce7
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
+4 -4
View File
@@ -481,7 +481,7 @@ TEST_F(RuntimeSchedulerTest, basicSameThreadExecution) {
EXPECT_FALSE(runtimeScheduler_->getIsSynchronous());
});
auto hasTask = stubQueue_->waitForTask(1ms);
auto hasTask = stubQueue_->waitForTask();
EXPECT_TRUE(hasTask);
EXPECT_FALSE(didRunSynchronousTask);
@@ -517,7 +517,7 @@ TEST_F(RuntimeSchedulerTest, sameThreadTaskCreatesImmediatePriorityTask) {
});
});
auto hasTask = stubQueue_->waitForTask(1ms);
auto hasTask = stubQueue_->waitForTask();
EXPECT_TRUE(hasTask);
EXPECT_FALSE(didRunSynchronousTask);
@@ -556,7 +556,7 @@ TEST_F(RuntimeSchedulerTest, sameThreadTaskCreatesLowPriorityTask) {
});
});
auto hasTask = stubQueue_->waitForTask(1ms);
auto hasTask = stubQueue_->waitForTask();
EXPECT_TRUE(hasTask);
EXPECT_FALSE(didRunSynchronousTask);
@@ -593,7 +593,7 @@ TEST_F(RuntimeSchedulerTest, twoThreadsRequestAccessToTheRuntime) {
});
});
auto hasTask = stubQueue_->waitForTasks(2, 1ms);
auto hasTask = stubQueue_->waitForTasks(2);
EXPECT_TRUE(hasTask);
EXPECT_FALSE(didRunWork);
packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h
+7 -6
View File
@@ -47,17 +47,15 @@ class StubQueue {
return callbackQueue_.size();
}
bool waitForTask(std::chrono::duration<double> timeout) const {
bool waitForTask() const {
std::unique_lock<std::mutex> lock(mutex_);
return signal_.wait_for(
lock, timeout, [this]() { return !callbackQueue_.empty(); });
lock, StubQueue::timeout, [this]() { return !callbackQueue_.empty(); });
}
bool waitForTasks(
std::size_t numberOfTasks,
std::chrono::duration<double> timeout) const {
bool waitForTasks(std::size_t numberOfTasks) const {
std::unique_lock<std::mutex> lock(mutex_);
return signal_.wait_for(lock, timeout, [this, numberOfTasks]() {
return signal_.wait_for(lock, StubQueue::timeout, [this, numberOfTasks]() {
return numberOfTasks == callbackQueue_.size();
});
}
@@ -66,4 +64,7 @@ class StubQueue {
mutable std::condition_variable signal_;
mutable std::mutex mutex_;
std::queue<std::function<void()>> callbackQueue_;
static constexpr std::chrono::duration<double> timeout =
std::chrono::milliseconds(100);
};