Commit 885f3782 authored by Anatoliy Potapchuk's avatar Anatoliy Potapchuk Committed by Commit Bot

Revert "[Sheriff] Disable many PolicyDeviceDisplayResolution tests."

This reverts commit 7f37ccd8.

Reason for revert: I have menually tested the previously failing tests
on linux-chromeos-os builders. Tests no longer fail, enabling them back.

Original change's description:
> [Sheriff] Disable many PolicyDeviceDisplayResolution tests.
>
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionRecommendedTest.Internal/0
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionRecommendedTest.Internal/1
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionRecommendedTest.Internal/2
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionRecommendedTest.ResizeExternalDisplay/0
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionRecommendedTest.ResizeExternalDisplay/1
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionRecommendedTest.ResizeExternalDisplay/2
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.ConnectExternalDisplay/0
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.Internal/0
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.Internal/2
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.ResizeExternalDisplay/0
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.ResizeExternalDisplay/1
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.ResizeExternalDisplay/2
> PolicyDeviceDisplayResolution/DeviceDisplayResolutionTest.SetAndUnsetPolicy/0
> PolicyDeviceDisplayResolution/DisplayResolutionBootTest.Reboot/0
>
> TBR=antrim@chromium.org
>
> Bug: 1000694
> Change-Id: I58373a317fc917f79ff440ec14c62dc9d84cda6b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1800409
> Reviewed-by: vitaliii <vitaliii@chromium.org>
> Commit-Queue: vitaliii <vitaliii@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#696000}

TBR=antrim@chromium.org,vitaliii@chromium.org

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

Bug: 1000694
Change-Id: I179ddcf31fe0ac425ce6f5d8c99d2ed35420d962
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1813345Reviewed-by: default avatarDenis Kuznetsov <antrim@chromium.org>
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698854}
parent d414125b
...@@ -283,8 +283,7 @@ class DeviceDisplayResolutionTest : public DeviceDisplayResolutionTestBase { ...@@ -283,8 +283,7 @@ class DeviceDisplayResolutionTest : public DeviceDisplayResolutionTestBase {
DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionTest); DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionTest);
}; };
// crbug.com/1000694. IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, Internal) {
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, DISABLED_Internal) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
EXPECT_EQ(kDefaultDisplayScale, GetScaleOfInternalDisplay()) EXPECT_EQ(kDefaultDisplayScale, GetScaleOfInternalDisplay())
...@@ -301,9 +300,7 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, DISABLED_Internal) { ...@@ -301,9 +300,7 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, DISABLED_Internal) {
<< "Scale of primary display after policy"; << "Scale of primary display after policy";
} }
// crbug.com/1000694. IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ResizeExternalDisplay) {
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
DISABLED_ResizeExternalDisplay) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
AddExternalDisplay(); AddExternalDisplay();
...@@ -331,9 +328,7 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ...@@ -331,9 +328,7 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
<< "Primary display scale after resizing external"; << "Primary display scale after resizing external";
} }
// crbug.com/1000694. IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ConnectExternalDisplay) {
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
DISABLED_ConnectExternalDisplay) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
SetPolicy(policy_value); SetPolicy(policy_value);
...@@ -353,9 +348,7 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ...@@ -353,9 +348,7 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
<< "Primary display scale after connecting external"; << "Primary display scale after connecting external";
} }
// crbug.com/1000694. IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, SetAndUnsetPolicy) {
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
DISABLED_SetAndUnsetPolicy) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
AddExternalDisplay(); AddExternalDisplay();
SetPolicy(policy_value); SetPolicy(policy_value);
...@@ -448,8 +441,7 @@ IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, PRE_Reboot) { ...@@ -448,8 +441,7 @@ IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, PRE_Reboot) {
<< "Initial primary display scale after policy set"; << "Initial primary display scale after policy set";
} }
// crbug.com/1000694. IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, Reboot) {
IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, DISABLED_Reboot) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
AddExternalDisplay(); AddExternalDisplay();
...@@ -502,9 +494,7 @@ class DeviceDisplayResolutionRecommendedTest ...@@ -502,9 +494,7 @@ class DeviceDisplayResolutionRecommendedTest
DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionRecommendedTest); DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionRecommendedTest);
}; };
// crbug.com/1000694. IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest, Internal) {
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest,
DISABLED_Internal) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
EXPECT_EQ(kDefaultDisplayResolution, GetResolutionOfInternalDisplay()) EXPECT_EQ(kDefaultDisplayResolution, GetResolutionOfInternalDisplay())
<< "Initial primary display resolution before policy"; << "Initial primary display resolution before policy";
...@@ -528,9 +518,8 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest, ...@@ -528,9 +518,8 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest,
<< "Scale of internal display after user operation"; << "Scale of internal display after user operation";
} }
// crbug.com/1000694.
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest, IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest,
DISABLED_ResizeExternalDisplay) { ResizeExternalDisplay) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
AddExternalDisplay(); AddExternalDisplay();
......
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