Commit 9259e4b1 authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot

Revert "Mark ScrollViewTest.ClipHeightToShortContentHeight flaky on Mac"

This reverts commit 5f5ef388.

Reason for revert: he test flakiness is caused by bot flakiness.

Original change's description:
> Mark ScrollViewTest.ClipHeightToShortContentHeight flaky on Mac
> 
> This patch marks ScrollViewTest.ClipHeightToShortContentHeight flaky on Mac.
> 
> TBR=kylixrd@chromium.org
> 
> Bug: 903001
> Change-Id: Iccc1792d207b44fe05d8abb3f1d86687a8567eec
> Reviewed-on: https://chromium-review.googlesource.com/c/1325275
> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
> Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#606337}

TBR=yosin@chromium.org

Change-Id: I06d5f420c5fcf8570812aa8b055e259a0861bbe1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 903001
Reviewed-on: https://chromium-review.googlesource.com/c/1325278Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606344}
parent ef5018f9
...@@ -763,14 +763,7 @@ TEST_F(ScrollViewTest, ClipHeightToNormalContentHeight) { ...@@ -763,14 +763,7 @@ TEST_F(ScrollViewTest, ClipHeightToNormalContentHeight) {
// Verifies ClipHeightTo() uses the minimum height when the content is shorter // Verifies ClipHeightTo() uses the minimum height when the content is shorter
// than the minimum height value. // than the minimum height value.
// TODO(crbug.com/903001): We should not mark GetIndexOf flaky. TEST_F(ScrollViewTest, ClipHeightToShortContentHeight) {
#if defined(OS_MACOSX)
#define MAYBE_ClipHeightToShortContentHeight \
DISABLED_ClipHeightToShortContentHeight
#else
#define MAYBE_ClipHeightToShortContentHeight ClipHeightToShortContentHeight
#endif
TEST_F(ScrollViewTest, MAYBE_ClipHeightToShortContentHeight) {
scroll_view_->ClipHeightTo(kMinHeight, kMaxHeight); scroll_view_->ClipHeightTo(kMinHeight, kMaxHeight);
const int kShortContentHeight = 10; const int kShortContentHeight = 10;
......
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