[PATCH xorg-gtest 8/8] xserver: use a default timout for 1s for Terminate() and Kill()

[Peter Hutterer]

Terminate/Kill will only wait for the server to exit for a nonzero timeout,
requiring callers to always specify a timeout for it to be useful.

The use-case of sending a SIGTERM to the server but not waiting for
it to shut down is narrow, so require those to actually specify a zero
timeout instead of everyone else.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 include/xorg/gtest/xorg-gtest-xserver.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/xorg/gtest/xorg-gtest-xserver.h b/include/xorg/gtest/xorg-gtest-xserver.h
index 90784e7..8721b94 100644
--- a/include/xorg/gtest/xorg-gtest-xserver.h
+++ b/include/xorg/gtest/xorg-gtest-xserver.h
@@ -80,7 +80,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 = 0);
+    virtual bool Terminate(unsigned int timeout = 1000);
 
     /**
      * Kills the server. With a vengeance.
@@ -92,7 +92,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 = 0);
+    virtual bool Kill(unsigned int timeout = 1000);
 
     /**
      * Remove the log file used by this server. By default, this function
-- 
1.7.11.4