PR #186 from rtokarev

Author: avtikhon

lib/tarantool_server.py

@@ -15,6 +15,7 @@
 
 from gevent import socket
 from greenlet import GreenletExit
+from threading import Timer
 
 try:
     from cStringIO import StringIO
@@ -950,10 +951,14 @@ def kill_current_test(self):
         if self.current_test.current_test_greenlet:
             gevent.kill(self.current_test.current_test_greenlet)
 
+    def kill(self):
+            color_log('Kill process {0}\n'.format(self.process.pid))
+            self.process.kill()
+
     def wait_stop(self):
         self.process.wait()
 
-    def stop(self, silent=True, signal=signal.SIGTERM):
+    def stop(self, silent=True, signal=signal.SIGTERM, timeout=5):
         """ Kill tarantool server using specified signal (SIGTERM by default)
 
             signal - a number of a signal
@@ -987,9 +992,12 @@ def stop(self, silent=True, signal=signal.SIGTERM):
                 self.process.send_signal(signal)
             except OSError:
                 pass
+            timer = Timer(timeout, lambda server: server.kill(), [self])
+            timer.start()
             if self.crash_detector is not None:
                 save_join(self.crash_detector)
             self.wait_stop()
+            timer.cancel()
 
         self.status = None
         if re.search(r'^/', str(self._admin.port)):