Test fixes

Author: mariosasko

tests/conftest.py

@@ -470,16 +470,16 @@ def text_path_with_unicode_new_lines(tmp_path_factory):
 
 
 @pytest.fixture(scope="session")
-def image_path():
+def image_file():
     return os.path.join(os.path.dirname(__file__), "features", "data", "test_image_rgb.jpg")
 
 
 @pytest.fixture(scope="session")
-def zip_image_path(image_path, tmp_path_factory):
+def zip_image_path(image_file, tmp_path_factory):
     import zipfile
 
     path = tmp_path_factory.mktemp("data") / "dataset.img.zip"
     with zipfile.ZipFile(path, "w") as f:
-        f.write(image_path, arcname=os.path.basename(image_path))
-        f.write(image_path, arcname=os.path.basename(image_path).replace(".jpg", "2.jpg"))
+        f.write(image_file, arcname=os.path.basename(image_file))
+        f.write(image_file, arcname=os.path.basename(image_file).replace(".jpg", "2.jpg"))
     return path

tests/packaged_modules/test_csv.py

@@ -41,12 +41,12 @@ def malformed_csv_file(tmp_path):
 
 
 @pytest.fixture
-def csv_file_with_image(tmp_path, image_path):
+def csv_file_with_image(tmp_path, image_file):
     filename = tmp_path / "csv_with_image.csv"
     data = textwrap.dedent(
         f"""\
         image
-        {image_path}
+        {image_file}
         """
     )
     with open(filename, "w") as f:

tests/packaged_modules/test_imagefolder.py

@@ -18,9 +18,9 @@ def cache_dir(tmp_path):
 
 
 @pytest.fixture
-def image_file_with_metadata(tmp_path, image_path):
+def image_file_with_metadata(tmp_path, image_file):
     image_filename = tmp_path / "image_rgb.jpg"
-    shutil.copyfile(image_path, image_filename)
+    shutil.copyfile(image_file, image_filename)
     image_metadata_filename = tmp_path / "metadata.jsonl"
     image_metadata = textwrap.dedent(
         """\

tests/packaged_modules/test_text.py

@@ -26,10 +26,10 @@ def text_file(tmp_path):
 
 
 @pytest.fixture
-def text_file_with_image(tmp_path, image_path):
+def text_file_with_image(tmp_path, image_file):
     filename = tmp_path / "text_with_image.txt"
     with open(filename, "w", encoding="utf-8") as f:
-        f.write(image_path)
+        f.write(image_file)
     return str(filename)