Commit 56b58e59 authored by Marc Grimme's avatar Marc Grimme Committed by Commit Bot

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

This reverts commit 8bc1fa58 because
once again the PolicyDeviceDisplayResolution tests are flaky.
The root cause needs to be investiated a tracking bug is filed #1051982.

R=marcgrimme

Bug: 1050303
Change-Id: Icd1cdb3f29dbb2fb78cea769c7fa36906405f7d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2054803Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Marc Grimme <marcgrimme@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741162}
parent 917c14ab
...@@ -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