From 7b1d9c5ff83a130f4ac38a0bfcface5ade325b87 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 27 Oct 2021 14:28:22 -0700 Subject: [PATCH 1/3] Re-enable test with higher timeout --- shell/platform/embedder/tests/embedder_a11y_unittests.cc | 3 +-- testing/run_all_unittests.cc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/shell/platform/embedder/tests/embedder_a11y_unittests.cc index bf5b8b6d045fa..b0d88bcc4f0b1 100644 --- a/shell/platform/embedder/tests/embedder_a11y_unittests.cc +++ b/shell/platform/embedder/tests/embedder_a11y_unittests.cc @@ -21,8 +21,7 @@ namespace testing { using Embedder11yTest = testing::EmbedderTest; -// TODO(52372): De-flake and re-enable. -TEST_F(Embedder11yTest, DISABLED_A11yTreeIsConsistent) { +TEST_F(Embedder11yTest, A11yTreeIsConsistent) { auto& context = GetEmbedderContext(EmbedderTestContextType::kOpenGLContext); fml::AutoResetWaitableEvent latch; diff --git a/testing/run_all_unittests.cc b/testing/run_all_unittests.cc index eb1ae28256bc3..5e6c934185912 100644 --- a/testing/run_all_unittests.cc +++ b/testing/run_all_unittests.cc @@ -22,8 +22,8 @@ std::optional GetTestTimeoutFromArgs(int argc, char** argv) { std::string timeout_seconds; if (!command_line.GetOptionValue("timeout", &timeout_seconds)) { - // No timeout specified. Default to 30s. - return fml::TimeDelta::FromSeconds(30u); + // No timeout specified. Default to 120s. + return fml::TimeDelta::FromSeconds(120u); } const auto seconds = std::stoi(timeout_seconds); From 2c5340ddaf0996f2654fd645e692bbd20d9c225e Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 4 Nov 2021 13:47:51 -0700 Subject: [PATCH 2/3] Skip on Fuchsia for now --- testing/fuchsia/test_suites.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/fuchsia/test_suites.yaml b/testing/fuchsia/test_suites.yaml index 60ab48cb6fa07..56f1c7684d584 100644 --- a/testing/fuchsia/test_suites.yaml +++ b/testing/fuchsia/test_suites.yaml @@ -30,7 +30,7 @@ package: txt_tests-0.far - test_command: run-test-suite fuchsia-pkg://fuchsia.com/ui_tests#meta/ui_tests.cm package: ui_tests-0.far -- test_command: run-test-suite fuchsia-pkg://fuchsia.com/embedder_tests#meta/embedder_tests.cm +- test_command: run-test-suite fuchsia-pkg://fuchsia.com/embedder_tests#meta/embedder_tests.cm -- --gtest_filter=-Embedder11yTest.A11yTreeIsConsistent package: embedder_tests-0.far - test_command: run-test-suite fuchsia-pkg://fuchsia.com/dart_utils_tests#meta/dart_utils_tests.cm package: dart_utils_tests-0.far From ebdf73c7c3a221c26b3ac4212deb7539a85ba9f2 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 4 Nov 2021 13:48:29 -0700 Subject: [PATCH 3/3] TODO --- testing/fuchsia/test_suites.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/fuchsia/test_suites.yaml b/testing/fuchsia/test_suites.yaml index 56f1c7684d584..7455b68903ebe 100644 --- a/testing/fuchsia/test_suites.yaml +++ b/testing/fuchsia/test_suites.yaml @@ -30,6 +30,7 @@ package: txt_tests-0.far - test_command: run-test-suite fuchsia-pkg://fuchsia.com/ui_tests#meta/ui_tests.cm package: ui_tests-0.far + # TODO(fxb/87493): re-enable when this doesn't crash. - test_command: run-test-suite fuchsia-pkg://fuchsia.com/embedder_tests#meta/embedder_tests.cm -- --gtest_filter=-Embedder11yTest.A11yTreeIsConsistent package: embedder_tests-0.far - test_command: run-test-suite fuchsia-pkg://fuchsia.com/dart_utils_tests#meta/dart_utils_tests.cm