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

Merge pull request #6944 from piotrhm/issue_1120

This commit is contained in:
Bruno Oliveira 2020-06-09 11:31:58 -03:00 committed by GitHub
parent c871d8b2b6 e862643b3f
commit 3de85a9ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -227,6 +227,7 @@ Pedro Algarvio
Philipp Loose Philipp Loose
Pieter Mulder Pieter Mulder
Piotr Banaszkiewicz Piotr Banaszkiewicz
Piotr Helm
Prashant Anand Prashant Anand
Pulkit Goyal Pulkit Goyal
Punyashloka Biswal Punyashloka Biswal

1
changelog/1120.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Fix issue where directories from tmpdir are not removed properly when multiple instances of pytest are running in parallel.

12
src/_pytest/pathlib.py
View File

@ -338,11 +338,13 @@ def make_numbered_dir_with_cleanup(
e = exc e = exc
else: else:
consider_lock_dead_if_created_before = p.stat().st_mtime - lock_timeout consider_lock_dead_if_created_before = p.stat().st_mtime - lock_timeout
cleanup_numbered_dir( # Register a cleanup for program exit
root=root, atexit.register(
prefix=prefix, cleanup_numbered_dir,
keep=keep, root,
consider_lock_dead_if_created_before=consider_lock_dead_if_created_before, prefix,
keep,
consider_lock_dead_if_created_before,
) )
return p return p
assert e is not None assert e is not None