cacheprovider: simplify _make_cachedir cleanup with finally

Use a single finally block instead of duplicating cleanup logic in
separate except blocks. The finally block always runs, ensuring cleanup
whether the operation succeeds (rename moves dir away, rmtree is no-op),
fails with a race condition (ENOTEMPTY/EEXIST), or any other exception.

Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
Co-authored-by: Cursor AI <ai@cursor.sh>
Co-authored-by: Anthropic Claude Opus 4.5 <claude@anthropic.com>

Author: 4 people

src/_pytest/cacheprovider.py

@@ -80,12 +80,10 @@ def _make_cachedir(target: Path) -> None:
         # gets "Directory not empty" from the rename. In this case,
         # everything is handled so just continue after cleanup.
         # On Windows, the error is a FileExistsError which translates to EEXIST.
-        shutil.rmtree(path, ignore_errors=True)
         if e.errno not in (errno.ENOTEMPTY, errno.EEXIST):
             raise
-    except BaseException:
+    finally:
         shutil.rmtree(path, ignore_errors=True)
-        raise
 
 
 @final