Fix tests

Author: harminius

server/mergin/tests/test_private_project_api.py

@@ -424,27 +424,102 @@ def test_admin_project_list(client):
     assert len(resp.json["items"]) == 14
 
 
-test_download_proj_data = [
-    # zips do not exist, version not specified -> call celery task to create zip with latest version
+# test_download_proj_data = [
+#     # project archive does not exist yet -> 202
+#     (0, None, 202),
+#     # specified version does not exist -> 404
+#     (0, "v100", 404),
+#     # zip is ready to download
+#     (1, None, 200),
+# ]
+#
+#
+# @pytest.mark.parametrize(
+#     "zipfile,version,exp_resp", test_download_proj_data
+# )
+# @patch("mergin.sync.tasks.create_project_version_zip.delay")
+def test_download_project(
+    # mock_create_zip,
+    client,
+    # zipfile,
+    # partial,
+    # expired,
+    # version,
+    # exp_resp,
+    # exp_call,
+    diff_project,
+):
+    """Test download endpoint responses and celery task calling"""
+    resp = client.head(
+        url_for(
+            "/app.mergin_sync_private_api_controller_download_project",
+            id=diff_project.id,
+            version="",
+        )
+    )
+    # zip archive does not exist yet
+    assert resp.status_code == 202
+    project_version = diff_project.get_latest_version()
+    # pretend archive has been created
+    zip_path = Path(project_version.zip_path)
+    if zip_path.parent.exists():
+        shutil.rmtree(zip_path.parent, ignore_errors=True)
+    zip_path.parent.mkdir(parents=True, exist_ok=True)
+    zip_path.touch()
+    resp = client.head(
+        url_for(
+            "/app.mergin_sync_private_api_controller_download_project",
+            id=diff_project.id,
+            version="",
+        )
+    )
+    # zip archive is ready -> download can start
+    assert resp.status_code == 200
+
+
+def test_large_project_download_fail(client, diff_project):
+    """Test downloading too large project is refused"""
+    resp = client.get(
+        url_for(
+            "/app.mergin_sync_private_api_controller_download_project",
+            id=diff_project.id,
+            version="v1",
+        )
+    )
+    assert resp.status_code == 202
+    # pretend testing project to be too large by lowering limit
+    client.application.config["MAX_DOWNLOAD_ARCHIVE_SIZE"] = 10
+    resp = client.get(
+        url_for(
+            "/app.mergin_sync_private_api_controller_download_project",
+            id=diff_project.id,
+            version="v1",
+        )
+    )
+    assert resp.status_code == 400
+
+
+test_prepare_proj_data = [
+    # zips do not exist, version not specified -> trigger celery to create zip with latest version
     (0, 0, 0, None, 202, 1),
     # expired partial zip exists -> call celery task
     (0, 1, 1, None, 202, 1),
-    # valid partial zip exists -> return, do not call celery
+    # valid partial zip exists -> do not call celery
     (0, 1, 0, None, 202, 0),
     # zips do not exist, version specified -> call celery task with specified version
     (0, 0, 0, "v1", 202, 1),
     # specified version does not exist -> 404
     (0, 0, 0, "v100", 404, 0),
-    # zip is ready to download
+    # zip is already prepared to download -> do not call celery
     (1, 0, 0, None, 200, 0),
 ]
 
 
 @pytest.mark.parametrize(
-    "zipfile,partial,expired,version,exp_resp,exp_call", test_download_proj_data
+    "zipfile,partial,expired,version,exp_resp,exp_call", test_prepare_proj_data
 )
 @patch("mergin.sync.tasks.create_project_version_zip.delay")
-def test_download_project(
+def test_prepare_archive(
     mock_create_zip,
     client,
     zipfile,
@@ -474,7 +549,7 @@ def test_download_project(
                 seconds=current_app.config["PARTIAL_ZIP_EXPIRATION"] + 1
             )
             modify_file_times(temp_zip_path, new_time)
-    resp = client.get(
+    resp = client.post(
         url_for(
             "/app.mergin_sync_private_api_controller_download_project",
             id=diff_project.id,
@@ -487,68 +562,3 @@ def test_download_project(
         call_args, _ = mock_create_zip.call_args
         args = call_args[0]
         assert args == diff_project.latest_version
-
-
-def test_large_project_download_fail(client, diff_project):
-    """Test downloading too large project is refused"""
-    resp = client.get(
-        url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
-            id=diff_project.id,
-            version="v1",
-        )
-    )
-    assert resp.status_code == 202
-    # pretend testing project to be too large by lowering limit
-    client.application.config["MAX_DOWNLOAD_ARCHIVE_SIZE"] = 10
-    resp = client.get(
-        url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
-            id=diff_project.id,
-            version="v1",
-        )
-    )
-    assert resp.status_code == 400
-
-
-@patch("mergin.sync.tasks.create_project_version_zip.delay")
-def test_remove_abandoned_zip(mock_prepare_zip, client, diff_project):
-    """Test project download removes partial zip which is inactive for some time"""
-    latest_version = diff_project.get_latest_version()
-    # pretend an incomplete zip remained
-    partial_zip_path = latest_version.zip_path + ".partial"
-    os.makedirs(os.path.dirname(partial_zip_path), exist_ok=True)
-    os.mknod(partial_zip_path)
-    assert os.path.exists(partial_zip_path)
-    # pretend abandoned partial zip by lowering the expiration limit
-    client.application.config["PARTIAL_ZIP_EXPIRATION"] = 0
-    # download should remove it (move to temp folder) and call a celery task which will try to create a correct zip
-    resp = client.get(
-        url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
-            id=diff_project.id,
-        )
-    )
-    assert mock_prepare_zip.called
-    assert resp.status_code == 202
-
-
-@patch("mergin.sync.tasks.create_project_version_zip.delay")
-def test_download_project_request_method(mock_prepare_zip, client, diff_project):
-    """Test head request does not create a celery job"""
-    resp = client.head(
-        url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
-            id=diff_project.id,
-        )
-    )
-    assert not mock_prepare_zip.called
-    assert resp.status_code == 202
-    resp = client.get(
-        url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
-            id=diff_project.id,
-        )
-    )
-    assert mock_prepare_zip.called
-    assert resp.status_code == 202