Merge pull request #185 from plotly/andrew/tmp_resiliency

Andrew/tmp resiliency
plotly · Jan 29, 2025 · d71b5a2 · d71b5a2
2 parents fc68b69 + 3d05b6e
commit d71b5a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/choreographer/utils/_tmpfile.py b/choreographer/utils/_tmpfile.py
@@ -85,6 +85,7 @@ def _delete_manually(  # noqa: C901, PLR0912
         self,
         *,
         check_only: bool = False,
+        quiet: bool = False,
     ) -> tuple[
         int,
         int,
@@ -133,11 +134,12 @@ def _delete_manually(  # noqa: C901, PLR0912
             else:
                 self.exists = False
         elif errors:
-            warnings.warn(  # noqa: B028
-                "The temporary directory could not be deleted, "
-                f"execution will continue. errors: {errors}",
-                TmpDirWarning,
-            )
+            if not quiet:
+                warnings.warn(  # noqa: B028
+                    "The temporary directory could not be deleted, "
+                    f"execution will continue. errors: {errors}",
+                    TmpDirWarning,
+                )
             self.exists = True
         else:
             self.exists = False
@@ -186,12 +188,14 @@ def remove_readonly(
 
             def extra_clean() -> None:
                 i = 0
-                tries = 5
+                tries = 4
                 while self.path.exists() and i < tries:
-                    time.sleep(1)
                     _logger.info(f"Extra manual clean executing {i}.")
-                    self._delete_manually()
+                    self._delete_manually(quiet=True)
                     i += 1
+                    time.sleep(2)
+                if self.path.exists():
+                    self._delete_manually(quiet=False)
 
             # testing doesn't look threads so I guess we'll block
             extra_clean()

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -89,7 +89,7 @@ async def wrapped_test_fn(*args, **kwargs):
 
 def pytest_configure():
     # change this by command line TODO
-    pytest.default_timeout = 12
+    pytest.default_timeout = 20
 
 
 # pytest shuts down its capture before logging/threads finish