diff options
| author | eugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 11:51:15 +0000 |
|---|---|---|
| committer | eugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 11:51:15 +0000 |
| commit | 34d79d57f10a167a63f5040954965c2c8d45421e (patch) | |
| tree | 6ccdfd5e7a08349d997bf77ac59d3bdd26ed2144 /chrome/test/android/javatests | |
| parent | 407d82b346ee97ed1930cd4ba60cc1e9a28210ea (diff) | |
| download | chromium_src-34d79d57f10a167a63f5040954965c2c8d45421e.zip chromium_src-34d79d57f10a167a63f5040954965c2c8d45421e.tar.gz chromium_src-34d79d57f10a167a63f5040954965c2c8d45421e.tar.bz2 | |
Scale several timeouts in Android tests.
This change increases timeout values when running under tools
like AddressSanitizer and Valgrind.
TEST=ASan/Android FYI bot should become a bit greener
BUG=325685
R=bulach@chromium.org, mkosiba@chromium.org, mnaganov@chromium.org, yfriedman@chromium.org
Review URL: https://codereview.chromium.org/99253008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/android/javatests')
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java index 06fd89e..9a3b8d4 100644 --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java @@ -6,6 +6,8 @@ package org.chromium.chrome.test.util; import android.content.Context; +import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout; + import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; @@ -18,7 +20,8 @@ import java.util.concurrent.TimeUnit; */ public final class ApplicationData { - private static final long MAX_CLEAR_APP_DATA_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(3); + private static final long MAX_CLEAR_APP_DATA_TIMEOUT_MS = + ScaleTimeout(TimeUnit.SECONDS.toMillis(3)); private static final long CLEAR_APP_DATA_POLL_INTERVAL_MS = MAX_CLEAR_APP_DATA_TIMEOUT_MS / 10; private ApplicationData() {} diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java index 98f79e3..dc0be01 100644 --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java @@ -11,6 +11,8 @@ import android.util.Pair; import junit.framework.Assert; +import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout; + import org.chromium.base.CommandLine; import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.AdvancedMockContext; @@ -44,10 +46,10 @@ public final class SyncTestUtil { "oauth2:https://www.google.com/accounts/OAuthLogin"; private static final String TAG = "SyncTestUtil"; - public static final int UI_TIMEOUT_MS = 20000; + public static final long UI_TIMEOUT_MS = ScaleTimeout(20000); public static final int CHECK_INTERVAL_MS = 250; - private static final int SYNC_WAIT_TIMEOUT_MS = 30 * 1000; + private static final long SYNC_WAIT_TIMEOUT_MS = ScaleTimeout(30 * 1000); private static final int SYNC_CHECK_INTERVAL_MS = 250; public static final Pair<String, String> SYNC_SUMMARY_STATUS = |