Cleanup duplicate images test

Author: hovnatan

superannotate/db/projects.py

@@ -442,6 +442,10 @@ def upload_images_from_folder_to_project(
     """Uploads all images with given extensions from folder_path to the project.
     Sets status of all the uploaded images to set_status if it is not None.
 
+    If an image with existing name already exists in the project it won't be uploaded,
+    and its path will be appended to the third member of return value of this
+    function.
+
     :param project: project name or metadata of the project to upload images_to
     :type project: str or dict
     :param folder_path: from which folder to upload the images
@@ -464,8 +468,8 @@ def upload_images_from_folder_to_project(
            Can be either "compressed" or "original".  If None then the default value in project settings will be used.
     :type image_quality_in_editor: str
 
-    :return: uploaded and not-uploaded images' filepaths
-    :rtype: tuple of list of strs
+    :return: uploaded, could-not-upload, existing-images filepaths
+    :rtype: tuple (3 members) of list of strs
     """
     if not isinstance(project, dict):
         project = get_project_metadata_bare(project)

tests/test_create_project_like.py tests/test_clone_project.pytests/test_create_project_like.py renamed to tests/test_clone_project.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-import time
 
 import pytest
 
@@ -17,26 +16,26 @@ def test_duplicate_upload_images(tmpdir):
 
     project = sa.create_project(PROJECT_NAME_VECTOR, "test", "Vector")
 
-    uploads = sa.upload_images_from_folder_to_project(
+    uploaded, could_not_upload, existing_images = sa.upload_images_from_folder_to_project(
         project, "./tests/sample_project_vector"
     )
 
-    assert len(uploads[0]) == 4
-    assert len(uploads[1]) == 0
-    assert len(uploads[2]) == 0
+    assert len(uploaded) == 4
+    assert len(could_not_upload) == 0
+    assert len(existing_images) == 0
 
-    uploads = sa.upload_images_to_project(
+    uploaded, could_not_upload, existing_images = sa.upload_images_to_project(
         project, ["./tests/sample_project_vector/dd.jpg"]
     )
 
-    assert len(uploads[0]) == 0
-    assert len(uploads[1]) == 1
-    assert len(uploads[2]) == 0
+    assert len(uploaded) == 0
+    assert len(could_not_upload) == 1
+    assert len(existing_images) == 0
 
-    uploads = sa.upload_images_from_folder_to_project(
+    uploaded, could_not_upload, existing_images = sa.upload_images_from_folder_to_project(
         project, "./tests/sample_project_vector"
     )
 
-    assert len(uploads[0]) == 0
-    assert len(uploads[1]) == 0
-    assert len(uploads[2]) == 4
+    assert len(uploaded) == 0
+    assert len(could_not_upload) == 0
+    assert len(existing_images) == 4