Replace cleanup_numbered_dir with atexit.register

piotrhm · Jun 9, 2020 · bde0ebc · bde0ebc
1 parent c871d8b
commit bde0ebc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -227,6 +227,7 @@ Pedro Algarvio
 Philipp Loose
 Pieter Mulder
 Piotr Banaszkiewicz
+Piotr Helm
 Prashant Anand
 Pulkit Goyal
 Punyashloka Biswal

diff --git a/changelog/1120.bugfix.rst b/changelog/1120.bugfix.rst
@@ -0,0 +1 @@
+Fix issue where directories from tmpdir are not removed properly when multiple instances of pytest are running in parallel.
diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py
@@ -333,16 +333,18 @@ def make_numbered_dir_with_cleanup(
         try:
             p = make_numbered_dir(root, prefix)
             lock_path = create_cleanup_lock(p)
-            register_cleanup_lock_removal(lock_path)
+            register_cleanup_lock_removal(lock_path) 
         except Exception as exc:
             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(
+                cleanup_numbered_dir,
+                root,
+                prefix,
+                keep,
+                consider_lock_dead_if_created_before,
             )
             return p
     assert e is not None