Commit 8bc1fa58 authored by Marc Grimme's avatar Marc Grimme Committed by Commit Bot

Revert "Reland "[Sheriff] Disable many PolicyDeviceDisplayResolution tests.""

This reverts commit de47b200.
Validates if the previously failing test are stable now to be reverted back once more.

R=marcgrimme

Bug: 1000694
Change-Id: I34806a0dd921ee90f4e8be7a83ee6c4cf27270a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2035975Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Marc Grimme <marcgrimme@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738503}
parent 8058ea94
...@@ -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