Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

Issue 2232383002: [TTS] Delay instrumentation tests at startup for flakes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved control of the delay to CS, new method in test base rather than new behavior. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
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 c6707dcdd1f2fab903fbd04632327e913d4ba523..3c7ff94e3c42115a2e622477e7594af695f49247 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
@@ -76,7 +76,7 @@ import java.util.concurrent.TimeoutException;
/**
* Tests the Contextual Search Manager using instrumentation tests.
*/
-@CommandLineFlags.Add(ContextualSearchFieldTrial.SUPPRESSION_TAPS + "=1000")
+
public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private static final String TEST_PAGE =
@@ -90,6 +90,8 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
private static final String NORMAL_PRIORITY_SEARCH_ENDPOINT = "/search?";
private static final String LOW_PRIORITY_SEARCH_ENDPOINT = "/s?";
private static final String CONTEXTUAL_SEARCH_PREFETCH_PARAM = "&pf=c";
+ // The number of ms to delay startup when a URL is being loaded.
+ private static final int ACTIVITY_STARTUP_DELAY_MS = 1000;
Theresa 2016/08/11 20:35:44 Can we add a TODO note to fix this more correctly?
private ActivityMonitor mActivityMonitor;
private ContextualSearchFakeServer mFakeServer;
@@ -221,7 +223,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
@Override
public void startMainActivity() throws InterruptedException {
- startMainActivityWithURL(mTestServer.getURL(TEST_PAGE));
+ startMainActivityWithDelay(mTestServer.getURL(TEST_PAGE), ACTIVITY_STARTUP_DELAY_MS);
Theresa 2016/08/11 20:35:44 I have a preference for putting the delay here ins
}
//============================================================================================
« no previous file with comments | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698