summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-08-22 15:35:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-22 22:35:42 +0000
commit8c6e5cdb6e1182e37ddfef3758a34358481b5797 (patch)
treea3c48dad8cda6cbe4831b3589f39a1ff11e2b6f2
parent594b93c68fe1b4035e3304685f51f4b9267948d9 (diff)
downloadchromium_src-8c6e5cdb6e1182e37ddfef3758a34358481b5797.zip
chromium_src-8c6e5cdb6e1182e37ddfef3758a34358481b5797.tar.gz
chromium_src-8c6e5cdb6e1182e37ddfef3758a34358481b5797.tar.bz2
[Android] Redisable one ContextualSearch test.
ContextualSearchManagerTest#testTapTriggeredPromoLimitForOptOut fails consistently on the main waterfall bots. It was recently enabled in https://codereview.chromium.org/1309913004 BUG=487005 TBR=donnd@chromium.org Review URL: https://codereview.chromium.org/1314493002 Cr-Commit-Position: refs/heads/master@{#344991}
-rw-r--r--chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
index eb1ada6..9c934c5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
@@ -1318,13 +1318,14 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
/**
* Tests the tap triggered promo limit for opt-out.
+ * @SmallTest
+ * @Feature({"ContextualSearch"})
*/
- @SmallTest
- @Feature({"ContextualSearch"})
@Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
@CommandLineFlags.Add({
ContextualSearchFieldTrial.PROMO_ON_LIMITED_TAPS + "=true",
ContextualSearchFieldTrial.TAP_TRIGGERED_PROMO_LIMIT + "=2"})
+ @FlakyTest
public void testTapTriggeredPromoLimitForOptOut()
throws InterruptedException, TimeoutException {
mPolicy.overrideDecidedStateForTesting(false);