jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Workaround for cmdexec bug on Windows 

This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows.
This commit is contained in:
Bruno Oliveira 2015-07-24 17:52:56 -03:00
parent b84fcbc85e
commit 4f1ae8c45e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/conftest.py
View File

@ -15,7 +15,13 @@ class LsofFdLeakChecker(object):
def _exec_lsof(self): def _exec_lsof(self):
pid = os.getpid() pid = os.getpid()
#return py.process.cmdexec("lsof -Ffn0 -p %d" % pid) #return py.process.cmdexec("lsof -Ffn0 -p %d" % pid)
return py.process.cmdexec("lsof -p %d" % pid) try:
return py.process.cmdexec("lsof -p %d" % pid)
except UnicodeDecodeError:
# cmdexec may raise UnicodeDecodeError on Windows systems
# with locale other than english:
# https://bitbucket.org/pytest-dev/py/issues/66
return ''
def _parse_lsof_output(self, out): def _parse_lsof_output(self, out):
def isopen(line): def isopen(line):

3
testing/test_capture.py
View File

@ -651,7 +651,8 @@ def lsof_check():
pid = os.getpid() pid = os.getpid()
try: try:
out = py.process.cmdexec("lsof -p %d" % pid) out = py.process.cmdexec("lsof -p %d" % pid)
except py.process.cmdexec.Error: except (py.process.cmdexec.Error, UnicodeDecodeError):
# about UnicodeDecodeError, see note on conftest.py
pytest.skip("could not run 'lsof'") pytest.skip("could not run 'lsof'")
yield yield
out2 = py.process.cmdexec("lsof -p %d" % pid) out2 = py.process.cmdexec("lsof -p %d" % pid)