Commit 3f779cc2 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

Revert "[Bookmarks] Disable testSearchBookmarks on Oreo."

This reverts commit 1b4b09c6.

Reason for revert: re-enabling the test, as the failure should've been
fixed by https://crrev.com/c/1345069.

Original change's description:
> [Bookmarks] Disable testSearchBookmarks on Oreo.
> 
> Conditionally disables this test due to flakiness on this configuration.
> 
> BUG=906788
> 
> TBR=twellington@chromium.org
> 
> Change-Id: Ief4f08ae1d9f8c73b3055d136af655498a97892f
> Reviewed-on: https://chromium-review.googlesource.com/c/1343361
> Reviewed-by: Donn Denman <donnd@chromium.org>
> Commit-Queue: Donn Denman <donnd@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#609507}

TBR=donnd@chromium.org,twellington@chromium.org

Bug: 906788
Change-Id: I838cc7bfa80059bb3b2e23668e2e32cfcd9edcb4
Reviewed-on: https://chromium-review.googlesource.com/c/1349982Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610814}
parent fa5f184f
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
package org.chromium.chrome.browser.bookmarks; package org.chromium.chrome.browser.bookmarks;
import android.os.Build;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest; import android.support.test.filters.MediumTest;
...@@ -274,10 +273,7 @@ public class BookmarkTest { ...@@ -274,10 +273,7 @@ public class BookmarkTest {
@Test @Test
@MediumTest @MediumTest
@DisableIf.Build(message = "Disable on Oreo which is flaky now. https://crbug.com/906788", public void testSearchBookmarks() throws Exception {
sdk_is_less_than = Build.VERSION_CODES.P, sdk_is_greater_than = Build.VERSION_CODES.N)
public void
testSearchBookmarks() throws Exception {
BookmarkPromoHeader.forcePromoStateForTests(BookmarkPromoHeader.PromoState.PROMO_SYNC); BookmarkPromoHeader.forcePromoStateForTests(BookmarkPromoHeader.PromoState.PROMO_SYNC);
addBookmark(TEST_PAGE_TITLE_GOOGLE, mTestPage); addBookmark(TEST_PAGE_TITLE_GOOGLE, mTestPage);
addBookmark(TEST_PAGE_TITLE_FOO, mTestPageFoo); addBookmark(TEST_PAGE_TITLE_FOO, mTestPageFoo);
......
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