File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -74,7 +74,10 @@ def isopen(line):
74
74
def matching_platform (self ):
75
75
try :
76
76
py .process .cmdexec ("lsof -v" )
77
- except py .process .cmdexec .Error :
77
+ except (py .process .cmdexec .Error , UnicodeDecodeError ):
78
+ # cmdexec may raise UnicodeDecodeError on Windows systems
79
+ # with locale other than english:
80
+ # https://bitbucket.org/pytest-dev/py/issues/66
78
81
return False
79
82
else :
80
83
return True
Original file line number Diff line number Diff line change @@ -650,7 +650,7 @@ def lsof_check():
650
650
try :
651
651
out = py .process .cmdexec ("lsof -p %d" % pid )
652
652
except (py .process .cmdexec .Error , UnicodeDecodeError ):
653
- # about UnicodeDecodeError, see note on conftest.py
653
+ # about UnicodeDecodeError, see note on pytester
654
654
pytest .skip ("could not run 'lsof'" )
655
655
yield
656
656
out2 = py .process .cmdexec ("lsof -p %d" % pid )
You can’t perform that action at this time.
0 commit comments