Re-enable fml_unittests (flutter#27664)

knopp · Jul 26, 2021 · 87ef3bc · 87ef3bc
1 parent 0509adc
commit 87ef3bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/fml/memory/task_runner_checker_unittest.cc b/fml/memory/task_runner_checker_unittest.cc
@@ -43,6 +43,7 @@ TEST(TaskRunnerCheckerTests, FailsTheCheckIfOnDifferentTaskRunner) {
 }
 
 TEST(TaskRunnerCheckerTests, SameTaskRunnerRunsOnTheSameThread) {
+  fml::MessageLoop::EnsureInitializedForCurrentThread();
   fml::MessageLoop& loop1 = fml::MessageLoop::GetCurrent();
   fml::MessageLoop& loop2 = fml::MessageLoop::GetCurrent();
   TaskQueueId a = loop1.GetTaskRunner()->GetTaskQueueId();
@@ -51,6 +52,7 @@ TEST(TaskRunnerCheckerTests, SameTaskRunnerRunsOnTheSameThread) {
 }
 
 TEST(TaskRunnerCheckerTests, RunsOnDifferentThreadsReturnsFalse) {
+  fml::MessageLoop::EnsureInitializedForCurrentThread();
   fml::MessageLoop& loop1 = fml::MessageLoop::GetCurrent();
   TaskQueueId a = loop1.GetTaskRunner()->GetTaskQueueId();
   fml::AutoResetWaitableEvent latch;

diff --git a/testing/run_tests.py b/testing/run_tests.py
@@ -173,8 +173,7 @@ def RunCCTests(build_dir, filter, coverage):
     ]
   RunEngineExecutable(build_dir, 'flow_unittests', filter, flow_flags + shuffle_flags, coverage=coverage)
 
-  # TODO(44614): Re-enable after https://github.com/flutter/flutter/issues/44614 has been addressed.
-  # RunEngineExecutable(build_dir, 'fml_unittests', filter, [ fml_unittests_filter ] + shuffle_flags)
+  RunEngineExecutable(build_dir, 'fml_unittests', filter, [ fml_unittests_filter ] + shuffle_flags)
 
   RunEngineExecutable(build_dir, 'runtime_unittests', filter, shuffle_flags, coverage=coverage)