improve tests readability

Author: harminius

server/mergin/tests/test_celery.py

@@ -168,8 +168,8 @@ def test_create_project_version_zip(diff_project):
     )  # after creating zip archive, celery remove partial zip
     after_mtime = zip_path.stat().st_mtime
     assert before_mtime < after_mtime
-    before_mtime = after_mtime
     # mock valid partial zip -> celery skips creating new zip and returns
+    before_mtime = zip_path.stat().st_mtime
     partial_zip_path.parent.mkdir(parents=True, exist_ok=True)
     partial_zip_path.touch()
     create_project_version_zip(diff_project.latest_version)

server/mergin/tests/test_private_project_api.py

@@ -460,31 +460,27 @@ def test_download_project(
     project_version = diff_project.get_latest_version()
     if zipfile:
         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()
     if partial:
         temp_zip_path = Path(project_version.zip_path + ".partial")
+        shutil.rmtree(temp_zip_path.parent, ignore_errors=True)
         temp_zip_path.parent.mkdir(parents=True, exist_ok=True)
         temp_zip_path.touch()
         if expired:
             new_time = datetime.now() - timedelta(
                 seconds=current_app.config["PARTIAL_ZIP_EXPIRATION"] + 1
             )
             modify_file_times(temp_zip_path, new_time)
-    try:
-        resp = client.get(
-            url_for(
-                "/app.mergin_sync_private_api_controller_download_project",
-                id=diff_project.id,
-                version=version if version else "",
-            )
+    resp = client.get(
+        url_for(
+            "/app.mergin_sync_private_api_controller_download_project",
+            id=diff_project.id,
+            version=version if version else "",
         )
-    finally:
-        # cleanup
-        if zipfile:
-            shutil.rmtree(zip_path.parent, ignore_errors=True)
-        if partial:
-            shutil.rmtree(temp_zip_path.parent, ignore_errors=True)
+    )
     assert resp.status_code == exp_resp
     assert mock_create_zip.called == exp_call
     if not version and exp_call: