Add timeout to server invoker

tk0miya · Dec 11, 2015 · 0ffabb9 · 0ffabb9
1 parent d85fb68
commit 0ffabb9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/testing/mysqld.py b/src/testing/mysqld.py
@@ -180,6 +180,7 @@ def start(self):
 
         logger = open(os.path.join(self.base_dir, 'tmp', 'mysqld.log'), 'wt')
         pid = os.fork()
+        exec_at = datetime.now()
         if pid == 0:
             os.dup2(logger.fileno(), sys.__stdout__.fileno())
             os.dup2(logger.fileno(), sys.__stderr__.fileno())
@@ -197,6 +198,9 @@ def start(self):
                 if os.waitpid(pid, os.WNOHANG)[0] != 0:
                     raise RuntimeError("*** failed to launch mysqld ***\n" + self.read_log())
 
+                if (datetime.now() - exec_at).seconds > 10.0:
+                    raise RuntimeError("*** failed to launch mysqld (timeout) ***\n" + self.read_log())
+
                 sleep(0.1)
 
             self.pid = pid