summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton_linux_uitest.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-17 21:00:18 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-17 21:00:18 +0000
commitc0d297956354b9c74fdcfb717efb272a772f4315 (patch)
tree94beb2ca93a6e9ad36952c6ef163f67f3da58b1e /chrome/browser/process_singleton_linux_uitest.cc
parent5d8128106e8bae8784d9468706198c61c505641b (diff)
downloadchromium_src-c0d297956354b9c74fdcfb717efb272a772f4315.zip
chromium_src-c0d297956354b9c74fdcfb717efb272a772f4315.tar.gz
chromium_src-c0d297956354b9c74fdcfb717efb272a772f4315.tar.bz2
linux: expose the ProcessSingleton timeout to speed tests
We have a 20-second timeout normally, but for testing purposes 1 second is plenty. Review URL: http://codereview.chromium.org/209018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_linux_uitest.cc')
-rw-r--r--chrome/browser/process_singleton_linux_uitest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc
index 6119e3d..d7f309a 100644
--- a/chrome/browser/process_singleton_linux_uitest.cc
+++ b/chrome/browser/process_singleton_linux_uitest.cc
@@ -58,7 +58,9 @@ class ProcessSingletonLinuxTest : public UITest {
ProcessSingleton process_singleton(user_data_dir);
- return process_singleton.NotifyOtherProcess();
+ // Use a short timeout to keep tests fast.
+ const int kTimeoutSeconds = 3;
+ return process_singleton.NotifyOtherProcessWithTimeout(kTimeoutSeconds);
}
std::vector<std::string> old_argv_;