Skip to content

GitLab

T
tangled
Commit 0fa143e4 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot
Browse files
Options

Re-enable ChromeOS tests that were considered flaky on dbg bots. 

Bug: 1030832
Bug: 949490, 990362, 997685, 1004327, 1021191
Bug: 1021594, 1022021, 1025213, 1025926, 1030393
Bug: 1030782, 1030810, 1031275, 1031341
Bug: 1033916, 1035485
Change-Id: Ibd81453c89f408499f5d375e9cc3cc85326288c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1978751
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727146}
parent 08e34ded
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 362 deletions
chrome/browser/chromeos/login/arc_terms_of_service_browsertest.cc
View file @ 0fa143e4
......@@ -397,9 +397,7 @@ IN_PROC_BROWSER_TEST_F(ArcTermsOfServiceScreenTest, LearnMoreDialogs) {
// Test that checking the "review after signing" checkbox updates pref
// kShowArcSettingsOnSessionStart.
// Flaky: https://crbug.com/1035485.
IN_PROC_BROWSER_TEST_F(ArcTermsOfServiceScreenTest,
DISABLED_ReviewPlayOptions) {
IN_PROC_BROWSER_TEST_F(ArcTermsOfServiceScreenTest, ReviewPlayOptions) {
WaitForTermsOfServiceWebViewToLoad();
Profile* profile = ProfileManager::GetActiveUserProfile();
......
chrome/browser/chromeos/login/configuration_based_oobe_browsertest.cc
View file @ 0fa143e4
......@@ -36,46 +36,6 @@
#include "components/prefs/pref_service.h"
#include "ui/base/ime/chromeos/input_method_util.h"
// TODO(crbug.com/997685): Flaky on linux.
#if defined(OS_LINUX)
#define MAYBE_TestSelectConnectedNetwork DISABLED_TestSelectConnectedNetwork
#define MAYBE_TestSelectNetwork DISABLED_TestSelectNetwork
#define MAYBE_TestDeviceRequisition DISABLED_TestDeviceRequisition
#else
#define MAYBE_TestSelectConnectedNetwork TestSelectConnectedNetwork
#define MAYBE_TestSelectNetwork TestSelectNetwork
#define MAYBE_TestDeviceRequisition TestDeviceRequisition
#endif
// Disabled due to flakiness: https://crbug.com/997685.
#define MAYBE_TestDemoModeAcceptEula DISABLED_TestDemoModeAcceptEula
#define MAYBE_TestDemoModeOfflineNetwork DISABLED_TestDemoModeOfflineNetwork
// Disabled on debug build due to flakiness: https://crbug.com/997685.
#if !defined(NDEBUG)
#define MAYBE_TestAcceptEula DISABLED_TestAcceptEula
#define MAYBE_TestDemoModeAcceptArcTos DISABLED_TestDemoModeAcceptArcTos
#define MAYBE_TestDemoModePreferences DISABLED_TestDemoModePreferences
#define MAYBE_TestEnableDemoMode DISABLED_TestEnableDemoMode
#define MAYBE_TestLeaveWelcomeScreen DISABLED_TestLeaveWelcomeScreen
#define MAYBE_TestSwitchLanguageIME DISABLED_TestSwitchLanguageIME
#define MAYBE_TestLeaveWelcomeScreen DISABLED_TestLeaveWelcomeScreen
#define MAYBE_TestSkipHIDDetection DISABLED_TestSkipHIDDetection
#define MAYBE_TestEnrollUsingToken DISABLED_TestEnrollUsingToken
#define MAYBE_TestSkipUpdate DISABLED_TestSkipUpdate
#else
#define MAYBE_TestAcceptEula TestAcceptEula
#define MAYBE_TestDemoModeAcceptArcTos TestDemoModeAcceptArcTos
#define MAYBE_TestDemoModePreferences TestDemoModePreferences
#define MAYBE_TestEnableDemoMode TestEnableDemoMode
#define MAYBE_TestLeaveWelcomeScreen TestLeaveWelcomeScreen
#define MAYBE_TestSwitchLanguageIME TestSwitchLanguageIME
#define MAYBE_TestLeaveWelcomeScreen TestLeaveWelcomeScreen
#define MAYBE_TestSkipHIDDetection TestSkipHIDDetection
#define MAYBE_TestEnrollUsingToken TestEnrollUsingToken
#define MAYBE_TestSkipUpdate TestSkipUpdate
#endif
namespace chromeos {
// This test case will use
......@@ -216,13 +176,13 @@ class OobeConfigurationEnrollmentTest : public OobeConfigurationTest {
};
// Check that configuration lets correctly pass Welcome screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestLeaveWelcomeScreen) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestLeaveWelcomeScreen) {
LoadConfiguration();
OobeScreenWaiter(NetworkScreenView::kScreenId).Wait();
}
// Check that language and input methods are set correctly.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestSwitchLanguageIME) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestSwitchLanguageIME) {
LoadConfiguration();
OobeScreenWaiter(NetworkScreenView::kScreenId).Wait();
......@@ -244,21 +204,20 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestSwitchLanguageIME) {
}
// Check that configuration lets correctly start Demo mode setup.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestEnableDemoMode) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestEnableDemoMode) {
LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
}
// Check that configuration lets correctly pass through demo preferences.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDemoModePreferences) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModePreferences) {
LoadConfiguration();
OobeScreenWaiter(NetworkScreenView::kScreenId).Wait();
}
// Check that configuration lets correctly use offline demo mode on network
// screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest,
MAYBE_TestDemoModeOfflineNetwork) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeOfflineNetwork) {
LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
SimulateOfflineEnvironment();
......@@ -267,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest,
// Check that configuration lets correctly use offline demo mode on EULA
// screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDemoModeAcceptEula) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeAcceptEula) {
LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
SimulateOfflineEnvironment();
......@@ -276,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDemoModeAcceptEula) {
// Check that configuration lets correctly use offline demo mode on ARC++ ToS
// screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDemoModeAcceptArcTos) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDemoModeAcceptArcTos) {
LoadConfiguration();
OobeScreenWaiter(DemoPreferencesScreenView::kScreenId).Wait();
SimulateOfflineEnvironment();
......@@ -292,14 +251,13 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDemoModeAcceptArcTos) {
}
// Check that configuration lets correctly select a network by GUID.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestSelectNetwork) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestSelectNetwork) {
LoadConfiguration();
OobeScreenWaiter(EulaView::kScreenId).Wait();
}
// Check that configuration would proceed if there is a connected network.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest,
MAYBE_TestSelectConnectedNetwork) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestSelectConnectedNetwork) {
LoadConfiguration();
OobeScreenWaiter(EulaView::kScreenId).Wait();
}
......@@ -312,7 +270,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestConnectedNetworkNoWelcome) {
}
// Check that when configuration has ONC and EULA, we get to update screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestAcceptEula) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestAcceptEula) {
update_engine::StatusResult status;
status.set_current_operation(update_engine::Operation::DOWNLOADING);
status.set_progress(0.1);
......@@ -324,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestAcceptEula) {
// Check that when configuration has requisition, it gets applied at the
// beginning.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDeviceRequisition) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, TestDeviceRequisition) {
LoadConfiguration();
OobeScreenWaiter(EulaView::kScreenId).Wait();
auto* policy_manager = g_browser_process->platform_part()
......@@ -335,14 +293,13 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTest, MAYBE_TestDeviceRequisition) {
// Check that configuration allows to skip Update screen and get to Enrollment
// screen.
IN_PROC_BROWSER_TEST_F(OobeConfigurationEnrollmentTest, MAYBE_TestSkipUpdate) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationEnrollmentTest, TestSkipUpdate) {
LoadConfiguration();
OobeScreenWaiter(EnrollmentScreenView::kScreenId).Wait();
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSignin);
}
IN_PROC_BROWSER_TEST_F(OobeConfigurationEnrollmentTest,
MAYBE_TestEnrollUsingToken) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationEnrollmentTest, TestEnrollUsingToken) {
policy_server_.SetUpdateDeviceAttributesPermission(false);
policy_server_.SetFakeAttestationFlow();
......@@ -363,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(OobeConfigurationTestNoHID, TestShowHID) {
// Check that HID detection screen is really skipped and rest of configuration
// is applied.
IN_PROC_BROWSER_TEST_F(OobeConfigurationTestNoHID, MAYBE_TestSkipHIDDetection) {
IN_PROC_BROWSER_TEST_F(OobeConfigurationTestNoHID, TestSkipHIDDetection) {
LoadConfiguration();
OobeScreenWaiter(NetworkScreenView::kScreenId).Wait();
}
......
chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc
View file @ 0fa143e4
......@@ -580,16 +580,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, OnlineSetupFlowSuccess) {
EXPECT_TRUE(StartupUtils::IsDeviceRegistered());
}
// Disabled on debug builds for flakiness. See crbug.com/1030782.
#if !defined(NDEBUG)
#define MAYBE_OnlineSetupFlowSuccessWithCountryCustomization \
DISABLED_OnlineSetupFlowSuccessWithCountryCustomization
#else
#define MAYBE_OnlineSetupFlowSuccessWithCountryCustomization \
OnlineSetupFlowSuccessWithCountryCustomization
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupTest,
MAYBE_OnlineSetupFlowSuccessWithCountryCustomization) {
OnlineSetupFlowSuccessWithCountryCustomization) {
// Simulate successful online setup.
enrollment_helper_.ExpectEnrollmentMode(
policy::EnrollmentConfig::MODE_ATTESTATION);
......@@ -676,13 +668,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest,
EXPECT_TRUE(StartupUtils::IsDeviceRegistered());
}
// Consistently times out on debug builds. See crbug.com/1031341.
#if !defined(NDEBUG)
#define MAYBE_OnlineSetupFlowErrorDefault DISABLED_OnlineSetupFlowErrorDefault
#else
#define MAYBE_OnlineSetupFlowErrorDefault OnlineSetupFlowErrorDefault
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupTest, MAYBE_OnlineSetupFlowErrorDefault) {
IN_PROC_BROWSER_TEST_F(DemoSetupTest, OnlineSetupFlowErrorDefault) {
// Simulate online setup failure.
enrollment_helper_.ExpectEnrollmentMode(
policy::EnrollmentConfig::MODE_ATTESTATION);
......@@ -746,16 +732,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, MAYBE_OnlineSetupFlowErrorDefault) {
EXPECT_FALSE(StartupUtils::IsDeviceRegistered());
}
// Consistently timing out on xxx. http://crbug/com/1025213
#if defined(OS_LINUX)
#define MAYBE_OnlineSetupFlowErrorPowerwashRequired \
DISABLED_OnlineSetupFlowErrorPowerwashRequired
#else
#define MAYBE_OnlineSetupFlowErrorPowerwashRequired \
OnlineSetupFlowErrorPowerwashRequired
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupTest,
MAYBE_OnlineSetupFlowErrorPowerwashRequired) {
IN_PROC_BROWSER_TEST_F(DemoSetupTest, OnlineSetupFlowErrorPowerwashRequired) {
// Simulate online setup failure that requires powerwash.
enrollment_helper_.ExpectEnrollmentMode(
policy::EnrollmentConfig::MODE_ATTESTATION);
......
chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc
View file @ 0fa143e4
......@@ -523,20 +523,12 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest, StoragePartitionUpdated) {
test::OobeJS().CreateWaiter(partition_valid_and_changed_condition)->Wait();
}
// Flaky in debug builds - crbug.com/1021191
#if !defined(NDEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_Success \
DISABLED_TestActiveDirectoryEnrollment_Success
#else
#define MAYBE_TestActiveDirectoryEnrollment_Success \
TestActiveDirectoryEnrollment_Success
#endif
// Shows the enrollment screen and mocks the enrollment helper to show Active
// Directory domain join screen. Verifies the domain join screen is displayed.
// Submits Active Directory credentials. Verifies that the AuthpolicyClient
// calls us back with the correct realm.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
MAYBE_TestActiveDirectoryEnrollment_Success) {
TestActiveDirectoryEnrollment_Success) {
ShowEnrollmentScreen();
enrollment_helper_.DisableAttributePromptUpdate();
enrollment_helper_.SetupActiveDirectoryJoin(
......@@ -562,18 +554,10 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
}
// Flaky in debug builds - crbug.com/1021191
#if !defined(NDEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_DistinguishedName \
DISABLED_TestActiveDirectoryEnrollment_DistinguishedName
#else
#define MAYBE_TestActiveDirectoryEnrollment_DistinguishedName \
TestActiveDirectoryEnrollment_DistinguishedName
#endif
// Verifies that the distinguished name specified on the Active Directory join
// domain screen correctly parsed and passed into AuthPolicyClient.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
MAYBE_TestActiveDirectoryEnrollment_DistinguishedName) {
TestActiveDirectoryEnrollment_DistinguishedName) {
ShowEnrollmentScreen();
enrollment_helper_.DisableAttributePromptUpdate();
enrollment_helper_.SetupActiveDirectoryJoin(
......@@ -603,20 +587,12 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
}
// Flaky in debug builds - crbug.com/1021191
#if !defined(NDEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_UIErrors \
DISABLED_TestActiveDirectoryEnrollment_UIErrors
#else
#define MAYBE_TestActiveDirectoryEnrollment_UIErrors \
TestActiveDirectoryEnrollment_UIErrors
#endif
// Shows the enrollment screen and mocks the enrollment helper to show Active
// Directory domain join screen. Verifies the domain join screen is displayed.
// Submits Active Directory different incorrect credentials. Verifies that the
// correct error is displayed.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
MAYBE_TestActiveDirectoryEnrollment_UIErrors) {
TestActiveDirectoryEnrollment_UIErrors) {
ShowEnrollmentScreen();
enrollment_helper_.SetupActiveDirectoryJoin(
enrollment_screen(), kAdUserDomain, std::string(), kDMToken);
......@@ -658,18 +634,10 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
ExpectElementValid(kAdPasswordInput, true);
}
// Flaky in debug builds - crbug.com/1021191
#if !defined(NDEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_ErrorCard \
DISABLED_TestActiveDirectoryEnrollment_ErrorCard
#else
#define MAYBE_TestActiveDirectoryEnrollment_ErrorCard \
TestActiveDirectoryEnrollment_ErrorCard
#endif
// Check that correct error card is shown (Active Directory one). Also checks
// that hitting retry shows Active Directory screen again.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
MAYBE_TestActiveDirectoryEnrollment_ErrorCard) {
TestActiveDirectoryEnrollment_ErrorCard) {
ShowEnrollmentScreen();
enrollment_helper_.SetupActiveDirectoryJoin(
enrollment_screen(), kAdUserDomain, std::string(), kDMToken);
......@@ -688,18 +656,10 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepADJoin);
}
// Flaky in debug builds - crbug.com/1021191
#if !defined(NDEBUG)
#define MAYBE_TestActiveDirectoryEnrollment_Streamline \
DISABLED_TestActiveDirectoryEnrollment_Streamline
#else
#define MAYBE_TestActiveDirectoryEnrollment_Streamline \
TestActiveDirectoryEnrollment_Streamline
#endif
// Check that configuration for the streamline Active Directory domain join
// propagates correctly to the Domain Join UI.
IN_PROC_BROWSER_TEST_F(ActiveDirectoryJoinTest,
MAYBE_TestActiveDirectoryEnrollment_Streamline) {
TestActiveDirectoryEnrollment_Streamline) {
ShowEnrollmentScreen();
std::string binary_config;
EXPECT_TRUE(base::Base64Decode(kAdDomainJoinEncryptedConfig, &binary_config));
......
chrome/browser/chromeos/login/kiosk_browsertest.cc
View file @ 0fa143e4
......@@ -1643,16 +1643,8 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
/*wait_for_app_data=*/true);
}
// crbug.com/949490
#if defined(OS_CHROMEOS) && !defined(NDEBUG)
#define MAYBE_LaunchCachedOfflineEnabledAppNoNetwork \
DISABLED_LaunchCachedOfflineEnabledAppNoNetwork
#else
#define MAYBE_LaunchCachedOfflineEnabledAppNoNetwork \
LaunchCachedOfflineEnabledAppNoNetwork
#endif
IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
MAYBE_LaunchCachedOfflineEnabledAppNoNetwork) {
LaunchCachedOfflineEnabledAppNoNetwork) {
set_test_app_id(kTestOfflineEnabledKioskApp);
EXPECT_TRUE(
KioskAppManager::Get()->HasCachedCrx(kTestOfflineEnabledKioskApp));
......
chrome/browser/chromeos/login/oobe_interactive_ui_test.cc
View file @ 0fa143e4
......@@ -647,13 +647,7 @@ void OobeInteractiveUITest::SimpleEndToEnd() {
WaitForLoginDisplayHostShutdown();
}
// Timing out on debug bots. crbug.com/1004327
#if defined(NDEBUG)
#define MAYBE_SimpleEndToEnd SimpleEndToEnd
#else
#define MAYBE_SimpleEndToEnd DISABLED_SimpleEndToEnd
#endif
IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, MAYBE_SimpleEndToEnd) {
IN_PROC_BROWSER_TEST_P(OobeInteractiveUITest, SimpleEndToEnd) {
SimpleEndToEnd();
}
......@@ -711,8 +705,8 @@ void OobeZeroTouchInteractiveUITest::ZeroTouchEndToEnd() {
WaitForLoginDisplayHostShutdown();
}
// crbug.com/997987. Disabled in debug since they time out.crbug.com/1004327
#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)
// crbug.com/997987. Disabled on MSAN since they time out. crbug.com/1004327
#if defined(MEMORY_SANITIZER)
#define MAYBE_EndToEnd DISABLED_EndToEnd
#else
#define MAYBE_EndToEnd EndToEnd
......
chrome/browser/chromeos/login/reset_browsertest.cc
View file @ 0fa143e4
......@@ -329,15 +329,23 @@ IN_PROC_BROWSER_TEST_F(ResetOobeTest, RequestAndCancleResetOnWelcomeScreen) {
EXPECT_EQ(0, update_engine_client_->rollback_call_count());
}
// See http://crbug.com/990362 for details.
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, DISABLED_PRE_ViewsLogic) {
// TODO(http://crbug.com/990362): Times out on MSAN buildbots.
#if defined(MEMORY_SANITIZER)
#define MAYBE_PRE_ViewsLogic DISABLED_PRE_ViewsLogic
#define MAYBE_ViewsLogic DISABLED_ViewsLogic
#else
#define MAYBE_PRE_ViewsLogic PRE_ViewsLogic
#define MAYBE_ViewsLogic ViewsLogic
#endif
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, MAYBE_PRE_ViewsLogic) {
PrefService* prefs = g_browser_process->local_state();
prefs->SetBoolean(prefs::kFactoryResetRequested, true);
update_engine_client_->set_can_rollback_check_result(false);
}
// See http://crbug.com/990362 for details.
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, DISABLED_ViewsLogic) {
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, MAYBE_ViewsLogic) {
PrefService* prefs = g_browser_process->local_state();
// Rollback unavailable. Show and cancel.
......@@ -440,9 +448,13 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
prefs->SetBoolean(prefs::kFactoryResetRequested, true);
}
// See http://crbug.com/990362 for details.
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
DISABLED_RollbackAvailable) {
// TODO(http://crbug.com/990362): Times out on MSAN buildbots.
#if defined(MEMORY_SANITIZER)
#define MAYBE_RollbackAvailable DISABLED_RollbackAvailable
#else
#define MAYBE_RollbackAvailable RollbackAvailable
#endif
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback, RollbackAvailable) {
PrefService* prefs = g_browser_process->local_state();
// PRE test triggers start with Reset screen.
......@@ -540,10 +552,14 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
prefs->SetBoolean(prefs::kFactoryResetRequested, true);
}
// This test frequently times out on sanitizer and debug build bots. See
// https://crbug.com/1025926.
// TODO(http://crbug.com/1025926): Times out on MSAN buildbots.
#if defined(MEMORY_SANITIZER)
#define MAYBE_RevertAfterCancel DISABLED_RevertAfterCancel
#else
#define MAYBE_RevertAfterCancel RevertAfterCancel
#endif
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTestWithRollback,
DISABLED_RevertAfterCancel) {
MAYBE_RevertAfterCancel) {
OobeScreenWaiter(ResetView::kScreenId).Wait();
EXPECT_TRUE(login_prompt_visible_observer_->signal_emitted());
......
chrome/browser/chromeos/login/screens/assistant_optin_flow_screen_browsertest.cc
View file @ 0fa143e4
......@@ -481,15 +481,7 @@ class AssistantOptInFlowTest : public MixinBasedInProcessBrowserTest {
LoginManagerMixin login_manager_{&mixin_host_, {test_user_}};
};
// Test times out in debug builds. crbug.com/1022021
#if !defined(NDEBUG)
#define MAYBE_AssistantOptInFlowTest DISABLED_AssistantOptInFlowTest
class DISABLED_AssistantOptInFlowTest : public AssistantOptInFlowTest {};
#else
#define MAYBE_AssistantOptInFlowTest AssistantOptInFlowTest
#endif
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, Basic) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, Basic) {
ash::AssistantState::Get()->NotifyStatusChanged(
ash::mojom::AssistantState::READY);
......@@ -525,7 +517,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, Basic) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, DisableScreenContext) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, DisableScreenContext) {
ash::AssistantState::Get()->NotifyStatusChanged(
ash::mojom::AssistantState::READY);
......@@ -565,8 +557,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, DisableScreenContext) {
EXPECT_FALSE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
AssistantStateUpdateAfterShow) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantStateUpdateAfterShow) {
SetUpAssistantScreensForTest();
assistant_optin_flow_screen_->Show();
......@@ -604,7 +595,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
SetUpAssistantScreensForTest();
fail_next_value_prop_url_request_ = true;
......@@ -644,7 +635,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, RetryOnWebviewLoadFail) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, RejectValueProp) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, RejectValueProp) {
SetUpAssistantScreensForTest();
ash::AssistantState::Get()->NotifyStatusChanged(
ash::mojom::AssistantState::READY);
......@@ -668,7 +659,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, RejectValueProp) {
EXPECT_FALSE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_ASK_EMAIL_OPT_IN);
ash::AssistantState::Get()->NotifyStatusChanged(
......@@ -709,7 +700,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, AskEmailOptIn_NotChecked) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_ASK_EMAIL_OPT_IN);
ash::AssistantState::Get()->NotifyStatusChanged(
......@@ -753,7 +744,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, AskEmailOptIn_Accepted) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, SkipShowingValueProp) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SkipShowingValueProp) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL);
......@@ -786,7 +777,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, SkipShowingValueProp) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
SkipShowingValuePropAndThirdPartyDisclosure) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
......@@ -818,7 +809,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, SpeakerIdEnrollment) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, SpeakerIdEnrollment) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_THIRD_PARTY_DISCLOSURE);
......@@ -907,7 +898,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, SpeakerIdEnrollment) {
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
BailOutDuringSpeakerIdEnrollment) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
......@@ -959,7 +950,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest,
SpeakerIdEnrollmentFailureAndRetry) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_SKIP_ACTIVITY_CONTROL |
......@@ -1015,7 +1006,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
EXPECT_TRUE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, WAADisabledByPolicy) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, WAADisabledByPolicy) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_WAA_DISABLED_BY_POLICY);
......@@ -1033,8 +1024,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest, WAADisabledByPolicy) {
EXPECT_FALSE(prefs->GetBoolean(assistant::prefs::kAssistantContextEnabled));
}
IN_PROC_BROWSER_TEST_F(MAYBE_AssistantOptInFlowTest,
AssistantDisabledByPolicy) {
IN_PROC_BROWSER_TEST_F(AssistantOptInFlowTest, AssistantDisabledByPolicy) {
assistant_settings_->set_consent_ui_flags(
FakeAssistantSettings::CONSENT_UI_FLAG_ASSISTANT_DISABLED_BY_POLICY);
......
chrome/browser/chromeos/login/screens/sync_consent_browsertest.cc
View file @ 0fa143e4
......@@ -349,13 +349,7 @@ IN_PROC_BROWSER_TEST_F(SyncConsentSplitSettingsSyncTest, DefaultFlow) {
EXPECT_TRUE(prefs->GetBoolean(syncer::prefs::kOsSyncFeatureEnabled));
}
// TODO(https://crbug.com/1033916) Flaky on linux-chromeos-dbg.
#if !defined(NDEBUG)
#define MAYBE_UserCanDisable DISABLED_UserCanDisable
#else
#define MAYBE_UserCanDisable UserCanDisable
#endif
IN_PROC_BROWSER_TEST_F(SyncConsentSplitSettingsSyncTest, MAYBE_UserCanDisable) {
IN_PROC_BROWSER_TEST_F(SyncConsentSplitSettingsSyncTest, UserCanDisable) {
LoginToSyncConsentScreen();
// Wait for content to load.
......
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