Changeset: d1123fc142f6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1123fc142f6
Modified Files:
        testing/Mtest.py.in
Branch: default
Log Message:

Mtest: make timeouts effective again after bfe9495a72d4

pstack is not even a generic linux tool, so don't rely on its existence

damage here was twofold: mtest tracebacked, and the mserver5 process
stuck didn't get killed at all any more, see tail of
http://monetdb.cwi.nl/testweb/logs/45017:bfe9495a72d4/GNU-Darwin-i386-propcheck/mtest-monetdb5


diffs (17 lines):

diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2373,8 +2373,11 @@ def killProc(proc, outfile = None, cmd =
         else:
             out = ''
     else:
-        p = subprocess.Popen(['pstack', str(proc.pid)], stdout = 
subprocess.PIPE)
-        out, err = p.communicate()
+        try:
+            p = subprocess.Popen(['pstack', str(proc.pid)], stdout = 
subprocess.PIPE)
+            out, err = p.communicate()
+        except:
+            pass
     if outfile is not None and out:
         try:
             outfile.write('\n%s\n' % out)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to