From 21471b7909402ed0e72e9b3acb31f9b0c7af7941 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 2 Jul 2013 16:25:03 +0400
Subject: [PATCH] Fix Bug#1196939 "Test engine kills all processes in some
cases"
---
test/lib/server.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/lib/server.py b/test/lib/server.py
index 8f292b14cb..20be099eb8 100644
--- a/test/lib/server.py
+++ b/test/lib/server.py
@@ -226,7 +226,9 @@ class Server(object):
return
# kill process
- os.kill(self.read_pidfile(), signal.SIGTERM)
+ pid = self.read_pidfile();
+ if pid != -1:
+ os.kill(pid, signal.SIGTERM)
#self.process.kill(signal.SIGTERM)
if self.gdb or self.valgrind:
self.process.expect(pexpect.EOF, timeout = 1 << 30)
--
GitLab