Commit 99a064e7 authored by Anqing Zhao's avatar Anqing Zhao Committed by Commit Bot

Re-enable NoConsumerAutoLaunchWhenUntrusted test case.

Considering this case was disabled 3 years ago, but it runs successfully
in local test. Let's re-enable it and monitor its current status.

Bug: 766169
Change-Id: I3518ef855e4cd319ca0e2045fe764751d0c54923
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2420608
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: default avatarAnatoliy Potapchuk <apotapchuk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808891}
parent 18165936
...@@ -1295,12 +1295,11 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) { ...@@ -1295,12 +1295,11 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) {
OobeScreenWaiter(KioskEnableScreenView::kScreenId).Wait(); OobeScreenWaiter(KioskEnableScreenView::kScreenId).Wait();
} }
// crbug.com/766169 // TODO(https://crbug.com/934109): Fix kiosk launch when the device is
// untrusted.
#if defined(ADDRESS_SANITIZER) #if defined(ADDRESS_SANITIZER)
#define MAYBE_DoNotLaunchWhenUntrusted DISABLED_DoNotLaunchWhenUntrusted #define MAYBE_DoNotLaunchWhenUntrusted DISABLED_DoNotLaunchWhenUntrusted
#else #else
// TODO(https://crbug.com/934109): Fix kiosk launch when the device is
// untrusted.
#define MAYBE_DoNotLaunchWhenUntrusted DISABLED_DoNotLaunchWhenUntrusted #define MAYBE_DoNotLaunchWhenUntrusted DISABLED_DoNotLaunchWhenUntrusted
#endif #endif
IN_PROC_BROWSER_TEST_F(KioskTest, MAYBE_DoNotLaunchWhenUntrusted) { IN_PROC_BROWSER_TEST_F(KioskTest, MAYBE_DoNotLaunchWhenUntrusted) {
...@@ -1327,17 +1326,9 @@ IN_PROC_BROWSER_TEST_F(KioskTest, MAYBE_DoNotLaunchWhenUntrusted) { ...@@ -1327,17 +1326,9 @@ IN_PROC_BROWSER_TEST_F(KioskTest, MAYBE_DoNotLaunchWhenUntrusted) {
&ignored)); &ignored));
} }
// crbug.com/766169
#if defined(ADDRESS_SANITIZER)
#define MAYBE_NoConsumerAutoLaunchWhenUntrusted \
DISABLED_NoConsumerAutoLaunchWhenUntrusted
#else
#define MAYBE_NoConsumerAutoLaunchWhenUntrusted \
NoConsumerAutoLaunchWhenUntrusted
#endif
// Verifies that a consumer device does not auto-launch kiosk mode when cros // Verifies that a consumer device does not auto-launch kiosk mode when cros
// settings are untrusted. // settings are untrusted.
IN_PROC_BROWSER_TEST_F(KioskTest, MAYBE_NoConsumerAutoLaunchWhenUntrusted) { IN_PROC_BROWSER_TEST_F(KioskTest, NoConsumerAutoLaunchWhenUntrusted) {
EnableConsumerKioskMode(); EnableConsumerKioskMode();
// Wait for and confirm the auto-launch warning. // Wait for and confirm the auto-launch warning.
......
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