Commit 28c567a2 authored by Anatoliy Potapchuk's avatar Anatoliy Potapchuk Committed by Commit Bot

Speculatively reenable KioskUpdateTest.* tests

These tests were previously disabled as flaky(they were timeouting on
the app launching step). The app launch logic was completely reworked
recently, which could mean that these test will work well.

Also, this cl makes window creation log message more visible, which
should ease debug of such timeouts.

Bug: 949490
Change-Id: I912d2d71cf12410b26688496dea306964e5b54bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359030Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799128}
parent 2e48be25
......@@ -2036,8 +2036,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PermissionChange) {
EXPECT_EQ("2.0.0", GetInstalledAppVersion().GetString());
}
// TODO(crbug.com/949490): PreserveLocalData is flaky ChromeOS rel AND deb.
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, DISABLED_PRE_PreserveLocalData) {
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_PreserveLocalData) {
// Installs v1 app and writes some local data.
set_test_app_id(kTestLocalFsKioskApp);
set_test_app_version("1.0.0");
......@@ -2051,7 +2050,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, DISABLED_PRE_PreserveLocalData) {
ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
}
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, DISABLED_PreserveLocalData) {
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PreserveLocalData) {
// Update existing v1 app installed in PRE_PreserveLocalData to v2
// that reads and verifies the local data.
set_test_app_id(kTestLocalFsKioskApp);
......@@ -2157,16 +2156,13 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
LaunchTestKioskAppWithTwoSecondaryApps();
}
// TODO(crbug.com/949490): test is flaky ChromeOS rel AND deb.
IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
DISABLED_PRE_UpdateMultiAppKioskRemoveOneApp) {
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_UpdateMultiAppKioskRemoveOneApp) {
LaunchTestKioskAppWithTwoSecondaryApps();
}
// Update the primary app to version 2 which removes one of the secondary app
// from its manifest.
IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
DISABLED_UpdateMultiAppKioskRemoveOneApp) {
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UpdateMultiAppKioskRemoveOneApp) {
set_test_app_id(kTestPrimaryKioskApp);
fake_cws()->SetUpdateCrx(kTestPrimaryKioskApp,
std::string(kTestPrimaryKioskApp) + "-2.0.0.crx",
......@@ -2185,15 +2181,13 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp2, "1.0.0"));
}
// crbug/1028606 Fails on linux-chromeos-*.
IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
DISABLED_PRE_UpdateMultiAppKioskAddOneApp) {
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_UpdateMultiAppKioskAddOneApp) {
LaunchTestKioskAppWithTwoSecondaryApps();
}
// Update the primary app to version 3 which adds a new secondary app in its
// manifest.
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, DISABLED_UpdateMultiAppKioskAddOneApp) {
IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UpdateMultiAppKioskAddOneApp) {
set_test_app_id(kTestPrimaryKioskApp);
fake_cws()->SetUpdateCrx(kTestPrimaryKioskApp,
std::string(kTestPrimaryKioskApp) + "-3.0.0.crx",
......
......@@ -404,7 +404,7 @@ void KioskLaunchController::OnAppLaunched() {
}
void KioskLaunchController::OnAppWindowCreated() {
DVLOG(1) << "App window created, closing splash screen.";
SYSLOG(INFO) << "App window created, closing splash screen.";
// If timer is running, do not remove splash screen for a few
// more seconds to give the user ability to exit kiosk session.
if (splash_wait_timer_.IsRunning())
......
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