extra tests for the tie break merge option

vlcn-io · Dec 27, 2023 · 75fa555 · 75fa555
1 parent da2e952
commit 75fa555
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/core/rs/core/src/sha.rs b/core/rs/core/src/sha.rs
@@ -1,2 +1,2 @@
 // The sha of the commit that this version of crsqlite was built from.
-pub const SHA: &'static str = "3a01980562615001d765eec61e3ed58147a93f93";
+pub const SHA: &'static str = "da2e95270d76818cd487029ad3786e9463fa341b";
diff --git a/py/correctness/tests/test_sync.py b/py/correctness/tests/test_sync.py
@@ -399,6 +399,14 @@ def test_merge_same_w_tie_breaker():
     changes21 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id FROM crsql_changes").fetchall()
 
     assert (changes12 == changes21)
+    # Test that we're stable / do not loop when we tie break equal values
+
+    sync_left_to_right(db1, db2, 0)
+    changes12_2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id FROM crsql_changes").fetchall()
+    sync_left_to_right(db2, db1, 0)
+    changes21_2 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id FROM crsql_changes").fetchall()
+    assert (changes12_2 == changes21)
+    assert (changes12 == changes21_2)
 
 
 def test_merge_matching_clocks_lesser_value():