p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7436 from bluetech/cleanup-lsof 

pytester: slightly clean up LsofFdLeakChecker
This commit is contained in:
Ran Benita 2020-07-04 10:55:11 +03:00 committed by GitHub
parent f76ac4c570 7b1ba7c0db
commit 64dd7000e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/_pytest/pytester.py
View File

@ -94,21 +94,16 @@ def pytest_configure(config: Config) -> None:
class LsofFdLeakChecker: class LsofFdLeakChecker:
def get_open_files(self): def get_open_files(self) -> List[Tuple[str, str]]:
out = self._exec_lsof() out = subprocess.run(
open_files = self._parse_lsof_output(out) ("lsof", "-Ffn0", "-p", str(os.getpid())),
return open_files stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
check=True,
universal_newlines=True,
).stdout
def _exec_lsof(self): def isopen(line: str) -> bool:
pid = os.getpid()
# py3: use subprocess.DEVNULL directly.
with open(os.devnull, "wb") as devnull:
return subprocess.check_output(
("lsof", "-Ffn0", "-p", str(pid)), stderr=devnull
).decode()
def _parse_lsof_output(self, out):
def isopen(line):
return line.startswith("f") and ( return line.startswith("f") and (
"deleted" not in line "deleted" not in line
and "mem" not in line and "mem" not in line
@ -130,9 +125,9 @@ class LsofFdLeakChecker:
return open_files return open_files
def matching_platform(self): def matching_platform(self) -> bool:
try: try:
subprocess.check_output(("lsof", "-v")) subprocess.run(("lsof", "-v"), check=True)
except (OSError, subprocess.CalledProcessError): except (OSError, subprocess.CalledProcessError):
return False return False
else: else:
@ -149,16 +144,17 @@ class LsofFdLeakChecker:
new_fds = {t[0] for t in lines2} - {t[0] for t in lines1} new_fds = {t[0] for t in lines2} - {t[0] for t in lines1}
leaked_files = [t for t in lines2 if t[0] in new_fds] leaked_files = [t for t in lines2 if t[0] in new_fds]
if leaked_files: if leaked_files:
error = [] error = [
error.append("***** %s FD leakage detected" % len(leaked_files)) "***** %s FD leakage detected" % len(leaked_files),
error.extend([str(f) for f in leaked_files]) *(str(f) for f in leaked_files),
error.append("*** Before:") "*** Before:",
error.extend([str(f) for f in lines1]) *(str(f) for f in lines1),
error.append("*** After:") "*** After:",
error.extend([str(f) for f in lines2]) *(str(f) for f in lines2),
error.append(error[0]) "***** %s FD leakage detected" % len(leaked_files),
error.append("*** function %s:%s: %s " % item.location) "*** function %s:%s: %s " % item.location,
error.append("See issue #2366") "See issue #2366",
]
item.warn(pytest.PytestWarning("\n".join(error))) item.warn(pytest.PytestWarning("\n".join(error)))