diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-14 11:02:12 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-14 11:06:00 +1000 |
| commit | 843755154ee49a49f2816fe833007c44be92727a (patch) | |
| tree | 20f53c50819c04ddb1a4b48f62bff3f24529f34d | |
| parent | a40e0de9d1fac358c08153eba08de7cfa35421cd (diff) | |
xserver: increase default Terminate/Kill timeout to 2 seconds
My box here takes just under 1200 ms to terminate a full server, which is
just over the current default timeout of 1000, causing the examples to fail.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/xorg/gtest/xorg-gtest-xserver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/xorg/gtest/xorg-gtest-xserver.h b/include/xorg/gtest/xorg-gtest-xserver.h index 4802003..efe46e1 100644 --- a/include/xorg/gtest/xorg-gtest-xserver.h +++ b/include/xorg/gtest/xorg-gtest-xserver.h @@ -101,7 +101,7 @@ class XServer : public xorg::testing::Process { * @returns true if termination succeeded and, if a timout is given, the * process shut down within that timeout. false otherwise. */ - virtual bool Terminate(unsigned int timeout = 1000); + virtual bool Terminate(unsigned int timeout = 2000); /** * Kills the server. With a vengeance. @@ -113,7 +113,7 @@ class XServer : public xorg::testing::Process { * @returns true if kill succeeded and, if a timout is given, the * process shut down within that timeout. false otherwise. */ - virtual bool Kill(unsigned int timeout = 1000); + virtual bool Kill(unsigned int timeout = 2000); /** * Remove the log file used by this server. By default, this function |