Commit 84375515 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

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's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent a40e0de9
...@@ -101,7 +101,7 @@ class XServer : public xorg::testing::Process { ...@@ -101,7 +101,7 @@ class XServer : public xorg::testing::Process {
* @returns true if termination succeeded and, if a timout is given, the * @returns true if termination succeeded and, if a timout is given, the
* process shut down within that timeout. false otherwise. * 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. * Kills the server. With a vengeance.
...@@ -113,7 +113,7 @@ class XServer : public xorg::testing::Process { ...@@ -113,7 +113,7 @@ class XServer : public xorg::testing::Process {
* @returns true if kill succeeded and, if a timout is given, the * @returns true if kill succeeded and, if a timout is given, the
* process shut down within that timeout. false otherwise. * 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 * Remove the log file used by this server. By default, this function
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment