Commit de47b200 authored by Leonard Grey's avatar Leonard Grey Committed by Commit Bot

Reland "[Sheriff] Disable many PolicyDeviceDisplayResolution tests."

This reverts commit 885f3782.

Reason for revert: Failed build with this revert in it:
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/14503

Original change's description:
> 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/+/1813345
> Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
> Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#698854}

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

Change-Id: Ifd5b92256da79436abc93e73df02a849919de4f6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1000694
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816128Reviewed-by: default avatarLeonard Grey <lgrey@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698898}
parent 905a841e
...@@ -283,7 +283,8 @@ class DeviceDisplayResolutionTest : public DeviceDisplayResolutionTestBase { ...@@ -283,7 +283,8 @@ class DeviceDisplayResolutionTest : public DeviceDisplayResolutionTestBase {
DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionTest); DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionTest);
}; };
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, Internal) { // crbug.com/1000694.
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())
...@@ -300,7 +301,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, Internal) { ...@@ -300,7 +301,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, Internal) {
<< "Scale of primary display after policy"; << "Scale of primary display after policy";
} }
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ResizeExternalDisplay) { // crbug.com/1000694.
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
DISABLED_ResizeExternalDisplay) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
AddExternalDisplay(); AddExternalDisplay();
...@@ -328,7 +331,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ResizeExternalDisplay) { ...@@ -328,7 +331,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ResizeExternalDisplay) {
<< "Primary display scale after resizing external"; << "Primary display scale after resizing external";
} }
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ConnectExternalDisplay) { // crbug.com/1000694.
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest,
DISABLED_ConnectExternalDisplay) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
SetPolicy(policy_value); SetPolicy(policy_value);
...@@ -348,7 +353,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ConnectExternalDisplay) { ...@@ -348,7 +353,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, ConnectExternalDisplay) {
<< "Primary display scale after connecting external"; << "Primary display scale after connecting external";
} }
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionTest, SetAndUnsetPolicy) { // crbug.com/1000694.
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);
...@@ -441,7 +448,8 @@ IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, PRE_Reboot) { ...@@ -441,7 +448,8 @@ IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, PRE_Reboot) {
<< "Initial primary display scale after policy set"; << "Initial primary display scale after policy set";
} }
IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, Reboot) { // crbug.com/1000694.
IN_PROC_BROWSER_TEST_P(DisplayResolutionBootTest, DISABLED_Reboot) {
const PolicyValue policy_value = GetParam(); const PolicyValue policy_value = GetParam();
AddExternalDisplay(); AddExternalDisplay();
...@@ -494,7 +502,9 @@ class DeviceDisplayResolutionRecommendedTest ...@@ -494,7 +502,9 @@ class DeviceDisplayResolutionRecommendedTest
DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionRecommendedTest); DISALLOW_COPY_AND_ASSIGN(DeviceDisplayResolutionRecommendedTest);
}; };
IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest, Internal) { // crbug.com/1000694.
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";
...@@ -518,8 +528,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest, Internal) { ...@@ -518,8 +528,9 @@ IN_PROC_BROWSER_TEST_P(DeviceDisplayResolutionRecommendedTest, Internal) {
<< "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,
ResizeExternalDisplay) { DISABLED_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