Commit 9bbaf616 authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot

Revert "Disable flaky/failing ScreenTimeControllerTests."

This reverts commit 479f1be6.

Reason for revert: The issue that caused flakiness is fixed (https://crbug.com/1005723).

Original change's description:
> Disable flaky/failing ScreenTimeControllerTests.
> 
> TBR: michaelpg
> Bug: 1007954, 1008289, 1008288, 1008286, 1008284, 1008282, 1008280, 1008273, 1008272, 1008269
> Change-Id: Ic611a4f597d2ddf9aaac66ff77fda64e3e4da8a4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1827277
> Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
> Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#700186}

TBR=finnur@chromium.org,michaelpg@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1007954, 1008289, 1008288, 1008286, 1008284, 1008282, 1008280, 1008273, 1008272, 1008269
Change-Id: I2f01ef970dc13c08820ea7baff3e6fd950da91af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1852417Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704722}
parent 909b4a5c
...@@ -153,7 +153,7 @@ class ScreenTimeControllerTest : public policy::LoginPolicyTestBase, ...@@ -153,7 +153,7 @@ class ScreenTimeControllerTest : public policy::LoginPolicyTestBase,
}; };
// Tests a simple lock override. // Tests a simple lock override.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_LockOverride) { IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, LockOverride) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 GMT"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 GMT");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -182,7 +182,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_LockOverride) { ...@@ -182,7 +182,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_LockOverride) {
} }
// Tests an unlock override on a bedtime. // Tests an unlock override on a bedtime.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_UnlockBedtime) { IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, UnlockBedtime) {
LogInChildAndSetupClockWithTime("5 Jan 2018 22:00:00 BRT"); LogInChildAndSetupClockWithTime("5 Jan 2018 22:00:00 BRT");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -234,8 +234,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_UnlockBedtime) { ...@@ -234,8 +234,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_UnlockBedtime) {
} }
// Tests an override with duration on a bedtime before it's locked. // Tests an override with duration on a bedtime before it's locked.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, OverrideBedtimeWithDuration) {
DISABLED_OverrideBedtimeWithDuration) {
LogInChildAndSetupClockWithTime("5 Jan 2018 20:45:00 PST"); LogInChildAndSetupClockWithTime("5 Jan 2018 20:45:00 PST");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -305,7 +304,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -305,7 +304,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
// Tests an override with duration on a daily limit before it's locked. // Tests an override with duration on a daily limit before it's locked.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
DISABLED_OverrideDailyLimitWithDuration) { OverrideDailyLimitWithDuration) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 BRT"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 BRT");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -369,8 +368,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -369,8 +368,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
} }
// Tests an unlock override with duration on a bedtime. // Tests an unlock override with duration on a bedtime.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, UnlockBedtimeWithDuration) {
DISABLED_UnlockBedtimeWithDuration) {
LogInChildAndSetupClockWithTime("5 Jan 2018 22:00:00 GMT"); LogInChildAndSetupClockWithTime("5 Jan 2018 22:00:00 GMT");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -436,8 +434,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -436,8 +434,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
} }
// Tests an unlock override with duration on a daily limit. // Tests an unlock override with duration on a daily limit.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, UnlockDailyLimitWithDuration) {
DISABLED_UnlockDailyLimitWithDuration) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -501,7 +498,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -501,7 +498,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
} }
// Tests the default time window limit. // Tests the default time window limit.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_DefaultBedtime) { IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DefaultBedtime) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 GMT"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 GMT");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -564,7 +561,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_DefaultBedtime) { ...@@ -564,7 +561,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_DefaultBedtime) {
} }
// Tests the default time window limit. // Tests the default time window limit.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_DefaultDailyLimit) { IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DefaultDailyLimit) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 GMT"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 GMT");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -630,8 +627,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_DefaultDailyLimit) { ...@@ -630,8 +627,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_DefaultDailyLimit) {
} }
// Tests that the bedtime locks an active session when it is reached. // Tests that the bedtime locks an active session when it is reached.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ActiveSessionBedtime) {
DISABLED_ActiveSessionBedtime) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST");
system::TimezoneSettings::GetInstance()->SetTimezoneFromID( system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
...@@ -669,8 +665,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -669,8 +665,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
} }
// Tests that the daily limit locks the device when it is reached. // Tests that the daily limit locks the device when it is reached.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ActiveSessionDailyLimit) {
DISABLED_ActiveSessionDailyLimit) {
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST");
system::TimezoneSettings::GetInstance()->SetTimezoneFromID( system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
...@@ -706,8 +701,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -706,8 +701,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
} }
// Tests bedtime during timezone changes. // Tests bedtime during timezone changes.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, BedtimeOnTimezoneChange) {
DISABLED_BedtimeOnTimezoneChange) {
LogInChildAndSetupClockWithTime("3 Jan 2018 10:00:00 GMT-0600"); LogInChildAndSetupClockWithTime("3 Jan 2018 10:00:00 GMT-0600");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -759,7 +753,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -759,7 +753,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
// Tests bedtime during timezone changes that make the clock go back in time. // Tests bedtime during timezone changes that make the clock go back in time.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
DISABLED_BedtimeOnEastToWestTimezoneChanges) { BedtimeOnEastToWestTimezoneChanges) {
LogInChildAndSetupClockWithTime("3 Jan 2018 8:00:00 GMT+1300"); LogInChildAndSetupClockWithTime("3 Jan 2018 8:00:00 GMT+1300");
ScreenLockerTester().Lock(); ScreenLockerTester().Lock();
...@@ -803,7 +797,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, ...@@ -803,7 +797,7 @@ IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest,
} }
// Tests if call the observers for usage time limit warning. // Tests if call the observers for usage time limit warning.
IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, DISABLED_CallObservers) { IN_PROC_BROWSER_TEST_P(ScreenTimeControllerTest, CallObservers) {
if (!is_feature_enabled_) if (!is_feature_enabled_)
return; return;
LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST"); LogInChildAndSetupClockWithTime("1 Jan 2018 10:00:00 PST");
......
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