Fix tests involving temp directory on macOS

src/huggingface_hub/file_download.py

@@ -861,7 +861,7 @@ def _create_symlink(src: str, dst: str, new_blob: bool = False) -> None:
 
     By default, it will try to create a symlink using a relative path. Relative paths have 2 advantages:
     - If the cache_folder is moved (example: back-up on a shared drive), relative paths within the cache folder will
-      not brake.
+      not break.
     - Relative paths seems to be better handled on Windows. Issue was reported 3 times in less than a week when
       changing from relative to absolute paths. See https://github.com/huggingface/huggingface_hub/issues/1398,
       https://github.com/huggingface/diffusers/issues/2729 and https://github.com/huggingface/transformers/pull/22228.
@@ -882,7 +882,7 @@ def _create_symlink(src: str, dst: str, new_blob: bool = False) -> None:
     cache, the file is duplicated on the disk.
 
     In case symlinks are not supported, a warning message is displayed to the user once when loading `huggingface_hub`.
-    The warning message can be disable with the `DISABLE_SYMLINKS_WARNING` environment variable.
+    The warning message can be disabled with the `DISABLE_SYMLINKS_WARNING` environment variable.
     """
     try:
         os.remove(dst)

src/huggingface_hub/utils/_fixes.py

@@ -40,7 +40,7 @@ def SoftTemporaryDirectory(
     prefix: Optional[str] = None,
     dir: Optional[Union[Path, str]] = None,
     **kwargs,
-) -> Generator[str, None, None]:
+) -> Generator[Path, None, None]:
     """
     Context manager to create a temporary directory and safely delete it.
 
@@ -52,7 +52,7 @@ def SoftTemporaryDirectory(
     See https://www.scivision.dev/python-tempfile-permission-error-windows/.
     """
     tmpdir = tempfile.TemporaryDirectory(prefix=prefix, suffix=suffix, dir=dir, **kwargs)
-    yield tmpdir.name
+    yield Path(tmpdir.name).resolve()
 
     try:
         # First once with normal cleanup

tests/conftest.py

@@ -1,6 +1,5 @@
 import os
 import shutil
-from pathlib import Path
 from typing import Generator
 
 import pytest
@@ -30,7 +29,7 @@ def test_cache_dir(self) -> None:
     ```
     """
     with SoftTemporaryDirectory() as cache_dir:
-        request.cls.cache_dir = Path(cache_dir).resolve()
+        request.cls.cache_dir = cache_dir
         yield
         # TemporaryDirectory is not super robust on Windows when a git repository is
         # cloned in it. See https://www.scivision.dev/python-tempfile-permission-error-windows/.

tests/test_cli.py

@@ -216,9 +216,10 @@ def test_every_as_float(self) -> None:
     @patch("huggingface_hub.commands.upload.HfApi.create_repo")
     def test_upload_folder_mock(self, create_mock: Mock, upload_mock: Mock, repo_info_mock: Mock) -> None:
         with SoftTemporaryDirectory() as cache_dir:
+            cache_path = cache_dir.absolute().as_posix()
             cmd = UploadCommand(
                 self.parser.parse_args(
-                    ["upload", "my-model", cache_dir, ".", "--private", "--include", "*.json", "--delete", "*.json"]
+                    ["upload", "my-model", cache_path, ".", "--private", "--include", "*.json", "--delete", "*.json"]
                 )
             )
             cmd.run()
@@ -227,7 +228,7 @@ def test_upload_folder_mock(self, create_mock: Mock, upload_mock: Mock, repo_inf
                 repo_id="my-model", repo_type="model", exist_ok=True, private=True, space_sdk=None
             )
             upload_mock.assert_called_once_with(
-                folder_path=cache_dir,
+                folder_path=cache_path,
                 path_in_repo=".",
                 repo_id=create_mock.return_value.repo_id,
                 repo_type="model",

tests/test_utils_fixes.py

@@ -17,9 +17,8 @@ def test_yaml_dump_explicit_no_unicode(self) -> None:
 
 class TestTemporaryDirectory(unittest.TestCase):
     def test_temporary_directory(self) -> None:
-        with SoftTemporaryDirectory(prefix="prefix", suffix="suffix") as tmpdir:
-            self.assertIsInstance(tmpdir, str)
-            path = Path(tmpdir)
+        with SoftTemporaryDirectory(prefix="prefix", suffix="suffix") as path:
+            self.assertIsInstance(path, Path)
             self.assertTrue(path.name.startswith("prefix"))
             self.assertTrue(path.name.endswith("suffix"))
             self.assertTrue(path.is_dir())