Revert "Control test timeouts based on debugger status or command line flags. (flutter#16375)"

This reverts commit e449472.

Author: NoamDev

testing/BUILD.gn

@@ -27,8 +27,6 @@ source_set("testing") {
   testonly = true
 
   sources = [
-    "debugger_detection.cc",
-    "debugger_detection.h",
     "run_all_unittests.cc",
     "test_timeout_listener.cc",
     "test_timeout_listener.h",

testing/debugger_detection.cc

@@ -2,38 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <iostream>
-#include <optional>
-#include <string>
-
 #include "flutter/fml/build_config.h"
-#include "flutter/fml/command_line.h"
-#include "flutter/testing/debugger_detection.h"
 #include "flutter/testing/test_timeout_listener.h"
 #include "gtest/gtest.h"
 
 #ifdef OS_IOS
 #include <asl.h>
 #endif  // OS_IOS
 
-std::optional<fml::TimeDelta> GetTestTimeoutFromArgs(int argc, char** argv) {
-  const auto command_line = fml::CommandLineFromArgcArgv(argc, argv);
-
-  std::string timeout_seconds;
-  if (!command_line.GetOptionValue("timeout", &timeout_seconds)) {
-    // No timeout specified. Default to 30s.
-    return fml::TimeDelta::FromSeconds(30u);
-  }
-
-  const auto seconds = std::stoi(timeout_seconds);
-
-  if (seconds < 1) {
-    return std::nullopt;
-  }
-
-  return fml::TimeDelta::FromSeconds(seconds);
-}
-
 int main(int argc, char** argv) {
 #ifdef OS_IOS
   asl_log_descriptor(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO,
@@ -43,23 +19,7 @@ int main(int argc, char** argv) {
 #endif  // OS_IOS
 
   ::testing::InitGoogleTest(&argc, argv);
-
-  // Check if the user has specified a timeout.
-  const auto timeout = GetTestTimeoutFromArgs(argc, argv);
-  if (!timeout.has_value()) {
-    FML_LOG(INFO) << "Timeouts disabled via a command line flag.";
-    return RUN_ALL_TESTS();
-  }
-
-  // Check if the user is debugging the process.
-  if (flutter::testing::GetDebuggerStatus() ==
-      flutter::testing::DebuggerStatus::kAttached) {
-    FML_LOG(INFO) << "Debugger is attached. Suspending test timeouts.";
-    return RUN_ALL_TESTS();
-  }
-
-  auto timeout_listener =
-      new flutter::testing::TestTimeoutListener(timeout.value());
+  auto timeout_listener = new flutter::testing::TestTimeoutListener();
   auto& listeners = ::testing::UnitTest::GetInstance()->listeners();
   listeners.Append(timeout_listener);
   auto result = RUN_ALL_TESTS();

testing/debugger_detection.h

@@ -72,10 +72,7 @@ TestTimeoutListener::TestTimeoutListener(fml::TimeDelta timeout)
     : timeout_(timeout),
       listener_thread_("test_timeout_listener"),
       listener_thread_runner_(listener_thread_.GetTaskRunner()),
-      pending_tests_(PendingTests::Create(listener_thread_runner_, timeout_)) {
-  FML_LOG(INFO) << "Test timeout of " << timeout_.ToSeconds()
-                << " seconds per test case will be enforced.";
-}
+      pending_tests_(PendingTests::Create(listener_thread_runner_, timeout_)) {}
 
 TestTimeoutListener::~TestTimeoutListener() {
   listener_thread_runner_->PostTask(

testing/run_all_unittests.cc

@@ -19,7 +19,8 @@ class PendingTests;
 
 class TestTimeoutListener : public ::testing::EmptyTestEventListener {
  public:
-  TestTimeoutListener(fml::TimeDelta timeout);
+  TestTimeoutListener(
+      fml::TimeDelta timeout = fml::TimeDelta::FromSeconds(30u));
 
   ~TestTimeoutListener();