summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 00:01:28 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-17 00:01:28 +0000
commit573950e6933485a561f375eef45d15d852271600 (patch)
tree0191a87796733b3ecf7ddf6d31b597d9fc4a0dfc /sandbox
parentd32353fec987fdbecaeb6695966c75f9a900ce92 (diff)
downloadchromium_src-573950e6933485a561f375eef45d15d852271600.zip
chromium_src-573950e6933485a561f375eef45d15d852271600.tar.gz
chromium_src-573950e6933485a561f375eef45d15d852271600.tar.bz2
Sandbox: Increase the default timeout of multiprocess tests to 1 minute.
This means that external timeouts (the test framework) are now the dominant factor to detect a hung test. BUG=137652 TEST=none Review URL: https://codereview.chromium.org/11299052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/win/tests/common/controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sandbox/win/tests/common/controller.cc b/sandbox/win/tests/common/controller.cc
index 1de2092..b66a6c8 100644
--- a/sandbox/win/tests/common/controller.cc
+++ b/sandbox/win/tests/common/controller.cc
@@ -14,7 +14,7 @@
namespace {
-static const int kDefaultTimeout = 10000;
+static const int kDefaultTimeout = 60000;
// Constructs a full path to a file inside the system32 folder.
std::wstring MakePathToSys32(const wchar_t* name, bool is_obj_man_path) {