bug fixes in persistentcache location init

nipype · Sep 26, 2023 · 96dcc48 · 96dcc48
1 parent 5376a86
commit 96dcc48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pydra/utils/hash.py b/pydra/utils/hash.py
@@ -60,7 +60,8 @@ def location_converter(path: ty.Union[Path, str, None]) -> Path:
     if path is None:
         path = PersistentCache.location_default()
     path = Path(path)
-    path.mkdir(parents=True, exist_ok=True)
+    if not path.exists():
+        path.mkdir(parents=True)
     return path
 
 

diff --git a/pydra/utils/tests/test_hash.py b/pydra/utils/tests/test_hash.py
@@ -335,11 +335,9 @@ def test_persistent_hash_cache(cache_path, text_file):
     assert hash_object(text_file, persistent_cache=cache_path) == modified_hash
 
     # Test that changes to the text file result in new hash
+    time.sleep(2)  # Need to ensure that the mtimes will be different
     text_file.fspath.write_text("bar")
-    # Ensure that the mtime will be incremented by mocking time.time
-    with mock.patch("time.time") as t:
-        t.return_value = time.time() + 10
-        assert hash_object(text_file, persistent_cache=cache_path) != modified_hash
+    assert hash_object(text_file, persistent_cache=cache_path) != modified_hash
     assert len(list(cache_path.iterdir())) == 2