Skip to content

Issue 1120 Cleaning up tmpdir's #6944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 9, 2020
Merged

Issue 1120 Cleaning up tmpdir's #6944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bde0ebc
Replace cleanup_numbered_dir with atexit.register
piotrhm Mar 20, 2020
f0e47c1
Fix typo
piotrhm Mar 20, 2020
e862643
Update 1120.bugfix.rst
piotrhm Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ Pedro Algarvio
Philipp Loose
Pieter Mulder
Piotr Banaszkiewicz
Piotr Helm
Prashant Anand
Pulkit Goyal
Punyashloka Biswal
Expand Down
1 change: 1 addition & 0 deletions changelog/1120.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix issue where directories from tmpdir are not removed properly when multiple instances of pytest are running in parallel.
12 changes: 7 additions & 5 deletions src/_pytest/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,13 @@ def make_numbered_dir_with_cleanup(
e = exc
else:
consider_lock_dead_if_created_before = p.stat().st_mtime - lock_timeout
cleanup_numbered_dir(
root=root,
prefix=prefix,
keep=keep,
consider_lock_dead_if_created_before=consider_lock_dead_if_created_before,
# Register a cleanup for program exit
atexit.register(
Copy link
Member

@nicoddemus nicoddemus Mar 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might still fail because some pytest process will finish before others so they might still step in each others toes, I guess?

Copy link
Contributor Author

@piotrhm piotrhm Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean one of the race condition cases mentioned in maybe_delete_a_numbered_dir()? I thought try_cleanup() invoked from cleanup_numbered_dir() is preventing from such case or at least we have some guarantees - based on comments from maybe_delete_a_numbered_dir().

cleanup_numbered_dir,
root,
prefix,
keep,
consider_lock_dead_if_created_before,
)
return p
assert e is not None
Expand Down