Commit 59cdbb99 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Speculatively re-enable ResetFirstAfterBootTestWithRollback tests

After changes in issue 1058022 the tests are much less likely to
time out on dgb/*san bots.

If tests will flake again, please disable them indvidually rather
then by reverting this CL.

Bug: 1049789, 1025926, 990362
Bug: 1058022
Change-Id: I5f20659b798ad1604d82df4b028453bfe93811e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152586Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759975}
parent 7d914ce6
...@@ -300,9 +300,7 @@ IN_PROC_BROWSER_TEST_F(ResetOobeTest, RequestAndCancleResetOnWelcomeScreen) { ...@@ -300,9 +300,7 @@ IN_PROC_BROWSER_TEST_F(ResetOobeTest, RequestAndCancleResetOnWelcomeScreen) {
EXPECT_EQ(0, update_engine_client()->rollback_call_count()); EXPECT_EQ(0, update_engine_client()->rollback_call_count());
} }
// See http://crbug.com/990362 for details. IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ViewsLogic) {
// TODO(crbug.com/1049789): Re-enable this test.
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, DISABLED_ViewsLogic) {
PrefService* prefs = g_browser_process->local_state(); PrefService* prefs = g_browser_process->local_state();
// Rollback unavailable. Show and cancel. // Rollback unavailable. Show and cancel.
...@@ -379,10 +377,7 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, RollbackUnavailable) { ...@@ -379,10 +377,7 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, RollbackUnavailable) {
CloseResetScreenAndWait(); CloseResetScreenAndWait();
} }
// TODO(http://crbug.com/990362): Times out on MSAN buildbots. IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback, RollbackAvailable) {
// TODO(http://crbug.com/990362): Flaky failures.
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
DISABLED_RollbackAvailable) {
PrefService* prefs = g_browser_process->local_state(); PrefService* prefs = g_browser_process->local_state();
// PRE test triggers start with Reset screen. // PRE test triggers start with Reset screen.
...@@ -459,10 +454,7 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback, ...@@ -459,10 +454,7 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
OobeWindowVisibilityWaiter(false).Wait(); OobeWindowVisibilityWaiter(false).Wait();
} }
// TODO(http://crbug.com/1025926): Times out on MSAN buildbots. IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback, RevertAfterCancel) {
// TODO(http://crbug.com/990362): Flaky failures.
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
DISABLED_RevertAfterCancel) {
OobeScreenWaiter(ResetView::kScreenId).Wait(); OobeScreenWaiter(ResetView::kScreenId).Wait();
EXPECT_EQ(0, FakePowerManagerClient::Get()->num_request_restart_calls()); EXPECT_EQ(0, FakePowerManagerClient::Get()->num_request_restart_calls());
......
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