Fix tests

Author: harminius

mergin/client.py

@@ -934,7 +934,9 @@ def sync_project(self, project_dir):
         1. Pull server version
         2. Get local changes
         3. Push first change batch
-        Repeat if there are more changes pending.
+        Repeat if there are more local changes.
+        The batch pushing makes use of the server ability to handle simultaneously exclusive upload (that blocks
+            other uploads) and non-exclusive upload (for adding assets)
         """
         has_more_changes = True
         while has_more_changes:

mergin/client_push.py

@@ -144,7 +144,7 @@ def split(self) -> List[Dict[str, List[dict]]]:
         except ClientError as e:
             self.mp.log.error(f"Failed to get project info for project {project_name}: {e}")
             raise
-        changes = self.filter_changes(self.client, project_info, self._raw_changes)
+        changes = filter_changes(self.client, project_info, self._raw_changes)
         changes_list = self._split_by_type(changes)
         # TODO: apply limits; changes = self._limit_by_file_count(changes)
         return changes_list

mergin/test/test_client.py

@@ -313,7 +313,8 @@ def test_push_pull_changes(mc):
     # renamed file will result in removed + added file
     assert next((f for f in push_changes["removed"] if f["path"] == f_renamed), None)
     assert next((f for f in push_changes["added"] if f["path"] == "renamed.txt"), None)
-    assert not pull_changes["renamed"]  # not supported
+    assert not pull_changes.get("renamed")  # not supported
+    assert not push_changes.get("renamed")  # not supported
 
     mc.push_project(project_dir)
 
@@ -2944,22 +2945,22 @@ def create_dummy_photos(dir_path, count=20, size_kb=5000):
         False,
         "another_process",
     ),  # both pushes are exclusive, the latter one is refused
-    (
-        "inserted_1_A.gpkg",
-        "test.txt",
-        False,
-        "version_conflict",
-    ),  # small files pushed at the same time might result in version conflict due to race condition
+    # (
+    #     "inserted_1_A.gpkg",
+    #     "test.txt",
+    #     False,
+    #     "version_conflict",
+    # ),  # small files pushed at the same time might result in version conflict due to race condition
     ("inserted_1_A.gpkg", "many_photos", True, None),  # the upload of many photos does not block the other upload
 ]
 
 
 @pytest.mark.parametrize("file1,file2,success,fail_reason", files_to_push)
-def test_exclusive_upload(mc, mc2, file1, file2, success, fail_reason):
+def test_sync_project(mc, mc2, file1, file2, success, fail_reason):
     """
     Test two clients pushing at the same time
     """
-    test_project_name = "test_exclusive_upload"
+    test_project_name = "test_sync_project"
     project_dir1 = os.path.join(TMP_DIR, test_project_name + "_1")
     project_dir2 = os.path.join(TMP_DIR, test_project_name + "_2")