summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-04 21:39:15 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-04 21:39:15 +0000
commitf1881430dda113b144fba5e3ee849e06b5d6049e (patch)
treef65ec8dc5a83535d90b903a3324c0559da7fb00c /base
parentb320c9742acb12fb2f23f0990fabc87ef31d097f (diff)
downloadchromium_src-f1881430dda113b144fba5e3ee849e06b5d6049e.zip
chromium_src-f1881430dda113b144fba5e3ee849e06b5d6049e.tar.gz
chromium_src-f1881430dda113b144fba5e3ee849e06b5d6049e.tar.bz2
Increasing live (sync) operation timeout to 45 seconds.
The sync integration tests were using a timeout of 30 seconds for live operations. Some of the sync stress tests are timing out because it takes longer for a full sync cycle to complete. This patch increases the timeout to 45 seconds, and should eliminate the occasional failures on the builders. TBR=tim@chromium.org BUG=68207 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/6023011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/test/test_timeouts.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 046f320..016456e 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -55,7 +55,7 @@ int TestTimeouts::command_execution_timeout_ms_ = 25000;
int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000;
// static
-int TestTimeouts::live_operation_timeout_ms_ = 30000;
+int TestTimeouts::live_operation_timeout_ms_ = 45000;
// static
void TestTimeouts::Initialize() {