Commit 9b3e340b authored by Etienne Pierre-Doray's avatar Etienne Pierre-Doray Committed by Commit Bot

Revert "Disable some flaky thread pool/group tests on Windows."

This reverts commit 15af2fe9.

Reason for revert: Tests should no longer be flaky after https://chromium.googlesource.com/chromium/src.git/+/9cc2312030ea55160dd559fff630689b7165a472

Original change's description:
> Disable some flaky thread pool/group tests on Windows.
> 
> 
> BUG:1064953
> TBR=etiennep@chromium.org
> 
> Change-Id: Ibcb1f4c184045cc429d733e78f05ff892ca1a018
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121380
> Reviewed-by: Tim Schumann <tschumann@chromium.org>
> Commit-Queue: Tim Schumann <tschumann@chromium.org>
> Auto-Submit: Tim Schumann <tschumann@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#753630}

TBR=tschumann@chromium.org,etiennep@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I6b6a2aa37eb373bf5a981b9b5ba3fab362a09637
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2127490Reviewed-by: default avatarEtienne Pierre-Doray <etiennep@chromium.org>
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754510}
parent cf7d4b7a
...@@ -386,13 +386,7 @@ TEST_F(ThreadPoolJobTaskSourceTest, MaxConcurrencyStagnateIfShouldYield) { ...@@ -386,13 +386,7 @@ TEST_F(ThreadPoolJobTaskSourceTest, MaxConcurrencyStagnateIfShouldYield) {
// Verifies that a missing call to NotifyConcurrencyIncrease() causes a DCHECK // Verifies that a missing call to NotifyConcurrencyIncrease() causes a DCHECK
// death after a timeout. // death after a timeout.
// TODO(crbug.com/1064953): Flaky on Windows. TEST_F(ThreadPoolJobTaskSourceTest, InvalidConcurrency) {
#if defined(OS_WIN)
#define MAYBE_InvalidConcurrency DISABLED_InvalidConcurrency
#else
#define MAYBE_InvalidConcurrency InvalidConcurrency
#endif
TEST_F(ThreadPoolJobTaskSourceTest, MAYBE_InvalidConcurrency) {
testing::FLAGS_gtest_death_test_style = "threadsafe"; testing::FLAGS_gtest_death_test_style = "threadsafe";
scoped_refptr<test::MockJobTask> job_task; scoped_refptr<test::MockJobTask> job_task;
...@@ -422,14 +416,7 @@ TEST_F(ThreadPoolJobTaskSourceTest, MAYBE_InvalidConcurrency) { ...@@ -422,14 +416,7 @@ TEST_F(ThreadPoolJobTaskSourceTest, MAYBE_InvalidConcurrency) {
// Verifies that a stale concurrency with no call to NotifyConcurrencyIncrease() // Verifies that a stale concurrency with no call to NotifyConcurrencyIncrease()
// causes a DCHECK death after a timeout. // causes a DCHECK death after a timeout.
TEST_F(ThreadPoolJobTaskSourceTest, StaleConcurrency) {
// TODO(crbug.com/1064953): Flaky on Windows.
#if defined(OS_WIN)
#define MAYBE_StaleConcurrency DISABLED_StaleConcurrency
#else
#define MAYBE_StaleConcurrency StaleConcurrency
#endif
TEST_F(ThreadPoolJobTaskSourceTest, MAYBE_StaleConcurrency) {
testing::FLAGS_gtest_death_test_style = "threadsafe"; testing::FLAGS_gtest_death_test_style = "threadsafe";
auto task_source = MakeRefCounted<JobTaskSource>( auto task_source = MakeRefCounted<JobTaskSource>(
......
...@@ -806,13 +806,7 @@ TEST_P(ThreadGroupTest, JoinJobTaskSource) { ...@@ -806,13 +806,7 @@ TEST_P(ThreadGroupTest, JoinJobTaskSource) {
// Verify that finishing work outside of a job unblocks workers with a stale // Verify that finishing work outside of a job unblocks workers with a stale
// max concurrency. // max concurrency.
// TODO(crbug.com/1064953): Flaky on Windows. TEST_P(ThreadGroupTest, JoinJobTaskSourceStaleConcurrency) {
#if defined(OS_WIN)
#define MAYBE_JoinJobTaskSourceStaleConcurrency DISABLED_JoinJobTaskSourceStaleConcurrency
#else
#define MAYBE_JoinJobTaskSourceStaleConcurrency JoinJobTaskSourceStaleConcurrency
#endif
TEST_P(ThreadGroupTest, MAYBE_JoinJobTaskSourceStaleConcurrency) {
StartThreadGroup(); StartThreadGroup();
WaitableEvent thread_running; WaitableEvent thread_running;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment