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 /sync | |
| 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 'sync')
| -rw-r--r-- | sync/sync_android.gypi | 1 | ||||
| -rw-r--r-- | sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sync/sync_android.gypi b/sync/sync_android.gypi index ad33342..bdeb2e4 100644 --- a/sync/sync_android.gypi +++ b/sync/sync_android.gypi @@ -15,6 +15,7 @@ }, 'dependencies': [ '../base/base.gyp:base_java', + '../base/base.gyp:base_java_test_support', '../net/net.gyp:net_java', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', '../third_party/guava/guava.gyp:guava_javalib', diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java index 3560a36..da1d11b 100644 --- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java +++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java @@ -22,6 +22,8 @@ import android.os.Bundle; import android.os.Handler; import android.util.Log; +import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout; + import org.chromium.sync.signin.AccountManagerDelegate; import org.chromium.sync.signin.AccountManagerHelper; @@ -65,7 +67,7 @@ public class MockAccountManager implements AccountManagerDelegate { private static final String TAG = "MockAccountManager"; - private static final int WAIT_TIME_FOR_GRANT_BROADCAST_MS = 20000; + private static final long WAIT_TIME_FOR_GRANT_BROADCAST_MS = ScaleTimeout(20000); static final String MUTEX_WAIT_ACTION = "org.chromium.sync.test.util.MockAccountManager.MUTEX_WAIT_ACTION"; |