Commit 4d33d42a authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

Speculatively enable DemoSetup*Tests

Looks like it was failing because of the renderer crash.

Bug: 1121422
Change-Id: Ia561febf0b6c4205c70b05779e3a8a3d51808e27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445549
Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: default avatarRoman Aleksandrov <raleksandrov@google.com>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813183}
parent 99835f16
...@@ -515,16 +515,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, InvokeWithTaps) { ...@@ -515,16 +515,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, InvokeWithTaps) {
EXPECT_TRUE(IsConfirmationDialogShown()); EXPECT_TRUE(IsConfirmationDialogShown());
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN.
#if defined(ADDRESS_SANITIZER)
#define MAYBE_DoNotInvokeWithNonConsecutiveTaps \
DISABLED_DoNotInvokeWithNonConsecutiveTaps
#else
#define MAYBE_DoNotInvokeWithNonConsecutiveTaps \
DoNotInvokeWithNonConsecutiveTaps
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
MAYBE_DoNotInvokeWithNonConsecutiveTaps) { DoNotInvokeWithNonConsecutiveTaps) {
// Use fake time to avoid flakiness. // Use fake time to avoid flakiness.
const base::Time kFakeTime = base::Time::UnixEpoch(); const base::Time kFakeTime = base::Time::UnixEpoch();
SetFakeTimeForMultiTapDetector(kFakeTime); SetFakeTimeForMultiTapDetector(kFakeTime);
...@@ -597,16 +589,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, OnlineSetupFlowSuccess) { ...@@ -597,16 +589,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, OnlineSetupFlowSuccess) {
EXPECT_TRUE(StartupUtils::IsDeviceRegistered()); EXPECT_TRUE(StartupUtils::IsDeviceRegistered());
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN.
#if defined(ADDRESS_SANITIZER)
#define MAYBE_OnlineSetupFlowSuccessWithCountryCustomization \
DISABLED_OnlineSetupFlowSuccessWithCountryCustomization
#else
#define MAYBE_OnlineSetupFlowSuccessWithCountryCustomization \
OnlineSetupFlowSuccessWithCountryCustomization
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
MAYBE_OnlineSetupFlowSuccessWithCountryCustomization) { OnlineSetupFlowSuccessWithCountryCustomization) {
// Simulate successful online setup. // Simulate successful online setup.
enrollment_helper_.ExpectEnrollmentMode( enrollment_helper_.ExpectEnrollmentMode(
policy::EnrollmentConfig::MODE_ATTESTATION); policy::EnrollmentConfig::MODE_ATTESTATION);
...@@ -873,14 +857,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, ...@@ -873,14 +857,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
EXPECT_FALSE(StartupUtils::IsDeviceRegistered()); EXPECT_FALSE(StartupUtils::IsDeviceRegistered());
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN. IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, OfflineDemoModeUnavailable) {
#if defined(ADDRESS_SANITIZER)
#define MAYBE_OfflineDemoModeUnavailable DISABLED_OfflineDemoModeUnavailable
#else
#define MAYBE_OfflineDemoModeUnavailable OfflineDemoModeUnavailable
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
MAYBE_OfflineDemoModeUnavailable) {
SimulateNetworkDisconnected(); SimulateNetworkDisconnected();
InvokeDemoModeWithAccelerator(); InvokeDemoModeWithAccelerator();
...@@ -960,14 +937,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, OfflineSetupFlowSuccess) { ...@@ -960,14 +937,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, OfflineSetupFlowSuccess) {
EXPECT_TRUE(StartupUtils::IsDeviceRegistered()); EXPECT_TRUE(StartupUtils::IsDeviceRegistered());
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN.
#if defined(ADDRESS_SANITIZER)
#define MAYBE_OfflineSetupFlowErrorDefault DISABLED_OfflineSetupFlowErrorDefault
#else
#define MAYBE_OfflineSetupFlowErrorDefault OfflineSetupFlowErrorDefault
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
MAYBE_OfflineSetupFlowErrorDefault) { OfflineSetupFlowErrorDefault) {
// Simulate offline setup failure. // Simulate offline setup failure.
enrollment_helper_.ExpectOfflineEnrollmentError( enrollment_helper_.ExpectOfflineEnrollmentError(
policy::EnrollmentStatus::ForStatus( policy::EnrollmentStatus::ForStatus(
...@@ -1032,16 +1003,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, ...@@ -1032,16 +1003,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
EXPECT_FALSE(StartupUtils::IsDeviceRegistered()); EXPECT_FALSE(StartupUtils::IsDeviceRegistered());
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN.
#if defined(ADDRESS_SANITIZER)
#define MAYBE_OfflineSetupFlowErrorPowerwashRequired \
DISABLED_OfflineSetupFlowErrorPowerwashRequired
#else
#define MAYBE_OfflineSetupFlowErrorPowerwashRequired \
OfflineSetupFlowErrorPowerwashRequired
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
MAYBE_OfflineSetupFlowErrorPowerwashRequired) { OfflineSetupFlowErrorPowerwashRequired) {
// Simulate offline setup failure. // Simulate offline setup failure.
enrollment_helper_.ExpectOfflineEnrollmentError( enrollment_helper_.ExpectOfflineEnrollmentError(
policy::EnrollmentStatus::ForLockError( policy::EnrollmentStatus::ForLockError(
...@@ -1132,16 +1095,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, ClickNetworkOnNetworkScreen) { ...@@ -1132,16 +1095,8 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, ClickNetworkOnNetworkScreen) {
EXPECT_TRUE(IsScreenShown(EulaView::kScreenId)); EXPECT_TRUE(IsScreenShown(EulaView::kScreenId));
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN.
#if defined(OS_CHROMEOS)
#define MAYBE_ClickConnectedNetworkOnNetworkScreen \
DISABLED_ClickConnectedNetworkOnNetworkScreen
#else
#define MAYBE_ClickConnectedNetworkOnNetworkScreen \
ClickConnectedNetworkOnNetworkScreen
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
MAYBE_ClickConnectedNetworkOnNetworkScreen) { ClickConnectedNetworkOnNetworkScreen) {
SimulateNetworkConnected(); SimulateNetworkConnected();
SkipToScreen(NetworkScreenView::kScreenId); SkipToScreen(NetworkScreenView::kScreenId);
EXPECT_TRUE(IsScreenDialogElementEnabled(NetworkScreenView::kScreenId, EXPECT_TRUE(IsScreenDialogElementEnabled(NetworkScreenView::kScreenId,
...@@ -1154,13 +1109,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, ...@@ -1154,13 +1109,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest,
EXPECT_TRUE(IsScreenShown(EulaView::kScreenId)); EXPECT_TRUE(IsScreenShown(EulaView::kScreenId));
} }
// TODO(https://crbug.com/1121422): Flaky on ChromeOS ASAN. IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, BackOnNetworkScreen) {
#if defined(OS_CHROMEOS)
#define MAYBE_BackOnNetworkScreen DISABLED_BackOnNetworkScreen
#else
#define MAYBE_BackOnNetworkScreen BackOnNetworkScreen
#endif
IN_PROC_BROWSER_TEST_F(DemoSetupArcSupportedTest, MAYBE_BackOnNetworkScreen) {
SimulateNetworkConnected(); SimulateNetworkConnected();
SkipToScreen(NetworkScreenView::kScreenId); SkipToScreen(NetworkScreenView::kScreenId);
......
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