Commit 7a9dea7c authored by Anatoliy Potapchuk's avatar Anatoliy Potapchuk Committed by Commit Bot

[Kiosk] Fix flaky WebKioskTest.LaunchWithConfigureAcceleratorPressed

There was a mistake in test code, which was creating a race condition
when we were setting network state to offline, and KioskLaunchController
assumed that we should resume app launch automatically as soon as we
have the network connection.

Bug: 1109651
Change-Id: I825dd7660e1f256a23f99bc2118ad9d7ce48bd7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346429
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796554}
parent 3646277b
...@@ -106,8 +106,8 @@ class WebKioskTest : public OobeBaseTest { ...@@ -106,8 +106,8 @@ class WebKioskTest : public OobeBaseTest {
void WaitNetworkConfigureScreenAndContinueWithOnlineState( void WaitNetworkConfigureScreenAndContinueWithOnlineState(
bool require_network, bool require_network,
bool auto_close = false) { bool auto_close = false) {
SetOnline(false);
OobeScreenWaiter(ErrorScreenView::kScreenId).Wait(); OobeScreenWaiter(ErrorScreenView::kScreenId).Wait();
SetOnline(false);
// Unblock app launch after the network configure screen is shown. // Unblock app launch after the network configure screen is shown.
SetBlockAppLaunch(false); SetBlockAppLaunch(false);
test::OobeJS().ExpectPathDisplayed(!require_network, test::OobeJS().ExpectPathDisplayed(!require_network,
...@@ -187,9 +187,7 @@ IN_PROC_BROWSER_TEST_F(WebKioskTest, AlreadyInstalledOffline) { ...@@ -187,9 +187,7 @@ IN_PROC_BROWSER_TEST_F(WebKioskTest, AlreadyInstalledOffline) {
// Presses a network configure dialog accelerator during app launch which will // Presses a network configure dialog accelerator during app launch which will
// interrupt the startup. We expect this dialog not to require network since the // interrupt the startup. We expect this dialog not to require network since the
// app have not yet been installed. // app have not yet been installed.
// TODO(https://crbug.com/1109651) Flaky test. IN_PROC_BROWSER_TEST_F(WebKioskTest, LaunchWithConfigureAcceleratorPressed) {
IN_PROC_BROWSER_TEST_F(WebKioskTest,
DISABLED_LaunchWithConfigureAcceleratorPressed) {
SetOnline(true); SetOnline(true);
PrepareAppLaunch(); PrepareAppLaunch();
LaunchApp(); LaunchApp();
......
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