Commit 7c30b213 authored by Giovanni Ortuño Urquidi's avatar Giovanni Ortuño Urquidi Committed by Commit Bot

Revert "Restore End-To-End test on ChromeOS"

This reverts commit 57466f0e.

Reason for revert: Tests are consistently timing out on debug builds:

https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg?limit=50
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/17377

Original change's description:
> Restore End-To-End test on ChromeOS
>
> Bug: 1054935
> Change-Id: I2da8e4c8240647614728c21e351a6b2e940aaae0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2074882
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#744800}

TBR=xiyuan@chromium.org,antrim@chromium.org,rsorokin@chromium.org

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

Bug: 1054935, 1058022
Change-Id: Ie52bbd3036bebee69aaf836556aceb5e3322f970
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086385
Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746675}
parent f94a7b84
...@@ -762,23 +762,16 @@ void OobeInteractiveUITest::SimpleEndToEnd() { ...@@ -762,23 +762,16 @@ void OobeInteractiveUITest::SimpleEndToEnd() {
WaitForLoginDisplayHostShutdown(); WaitForLoginDisplayHostShutdown();
} }
// Disabled on *San bots since they time out. // crbug.com/1054935: SimpleEndToEnd is flaky on ChromeOS.
#if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \ #if defined(OS_CHROMEOS)
defined(LEAK_SANITIZER) IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, DISABLED_SimpleEndToEnd) {
#define MAYBE_SimpleEndToEnd DISABLED_SimpleEndToEnd SimpleEndToEnd();
}
#else #else
#define MAYBE_SimpleEndToEnd SimpleEndToEnd IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, SimpleEndToEnd) {
#endif
// Note that this probably the largest test that is run on ChromeOS, and it
// might be running close to time limits especially on instrumented builds.
// As such it might sometimes cause flakiness.
// Please do not disable it for whole ChromeOS, only for specific instrumented
// bots. Another alternative is to increase respective multiplier in
// base/test/test_timeouts.h.
IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, MAYBE_SimpleEndToEnd) {
SimpleEndToEnd(); SimpleEndToEnd();
} }
#endif
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
OobeInteractiveUITestImpl, OobeInteractiveUITestImpl,
...@@ -835,21 +828,16 @@ void OobeZeroTouchInteractiveUITest::ZeroTouchEndToEnd() { ...@@ -835,21 +828,16 @@ void OobeZeroTouchInteractiveUITest::ZeroTouchEndToEnd() {
WaitForLoginDisplayHostShutdown(); WaitForLoginDisplayHostShutdown();
} }
// crbug.com/997987. Disabled on MSAN since they time out. // crbug.com/997987. Disabled on MSAN since they time out. crbug.com/1004327
// crbug.com/1054935: EndToEnd is flaky on ChromeOS.
// crbug.com/1055853: EndToEnd is flaky on Linux Chromium OS ASan LSan // crbug.com/1055853: EndToEnd is flaky on Linux Chromium OS ASan LSan
#if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \ #if defined(MEMORY_SANITIZER) || defined(OS_CHROMEOS) || \
defined(LEAK_SANITIZER) defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
#define MAYBE_EndToEnd DISABLED_EndToEnd #define MAYBE_EndToEnd DISABLED_EndToEnd
#else #else
#define MAYBE_EndToEnd EndToEnd #define MAYBE_EndToEnd EndToEnd
#endif #endif
// Note that this probably the largest test that is run on ChromeOS, and it
// might be running close to time limits especially on instrumented builds.
// As such it might sometimes cause flakiness.
// Please do not disable it for whole ChromeOS, only for specific instrumented
// bots. Another alternative is to increase respective multiplier in
// base/test/test_timeouts.h.
IN_PROC_BROWSER_TEST_P(OobeZeroTouchInteractiveUITest, MAYBE_EndToEnd) { IN_PROC_BROWSER_TEST_P(OobeZeroTouchInteractiveUITest, MAYBE_EndToEnd) {
ZeroTouchEndToEnd(); ZeroTouchEndToEnd();
} }
......
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