From cbb4c0dadc36aa44f9763f6d618c3b943ca11b00 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 21 Apr 2010 06:23:19 -0700 Subject: [PATCH] use taskkill cmdline for jython/win32 but skip test on jython because it does not return a subprocess PID --HG-- branch : trunk --- py/_process/killproc.py | 2 +- testing/process/test_killproc.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/py/_process/killproc.py b/py/_process/killproc.py index fdcd9fe5b..8fa628cbd 100644 --- a/py/_process/killproc.py +++ b/py/_process/killproc.py @@ -1,7 +1,7 @@ import py import os, sys -if sys.platform == "win32": +if sys.platform == "win32" or getattr(os, '_name', '') == 'nt': try: import ctypes except ImportError: diff --git a/testing/process/test_killproc.py b/testing/process/test_killproc.py index 4c89eb1d9..57088e1db 100644 --- a/testing/process/test_killproc.py +++ b/testing/process/test_killproc.py @@ -1,6 +1,7 @@ import py, sys +@py.test.mark.skipif("sys.platform.startswith('java')") def test_kill(tmpdir): subprocess = py.test.importorskip("subprocess") t = tmpdir.join("t.py")