fix tie_breaker test

Author: somtochiama

py/correctness/tests/test_sync.py

@@ -397,38 +397,41 @@ def test_merge_same_w_tie_breaker():
     db3.execute("SELECT crsql_config_set('merge-equal-values', 1);")
     db3.commit()
 
+    # Sync changes so all nodes have seen changes from other nodes
     sync_left_to_right(db1, db2, 0)
-    changes2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
-    
     sync_left_to_right(db2, db1, 0)
-    changes1 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
-
     sync_left_to_right(db2, db3, 0)
-    changes3 = db3.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    sync_left_to_right(db3, db2, 0)
+    sync_left_to_right(db3, db1, 0)
+
+    changes1 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
+    changes2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
+    changes3 = db3.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
 
-    # check that everything by db_version is the same
-    assert (changes2[:-6] == changes1[:-6] == changes3[:-6])
+    # check that everything but db_version is the same
+    # print("changes2", changes2)
+    assert (changes2[:-1] == changes1[:-1] == changes3[:-1])
 
     # Test that we're stable / do not loop when we tie break equal values
 
     sync_left_to_right(db2, db1, 0)
-    changes1_2 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    changes1_2 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
     sync_left_to_right(db3, db2, 0)
-    changes2_2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    changes2_2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
     sync_left_to_right(db1, db3, 0)
-    changes3_2 = db3.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    changes3_2 = db3.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
 
     # everything should stay the same, including db_version
     assert (changes1 == changes1_2)
     assert (changes2 == changes2_2)
     assert (changes3 == changes3_2)
 
     sync_left_to_right(db3, db1, 0)
-    changes1_2 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    changes1_2 = db1.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
     sync_left_to_right(db1, db2, 0)
-    changes2_2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    changes2_2 = db2.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
     sync_left_to_right(db2, db3, 0)
-    changes3_2 = db3.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()
+    changes3_2 = db3.execute("SELECT \"table\", pk, cid, val, col_version, site_id, db_version FROM crsql_changes").fetchall()[0]
 
     # everything should stay the same, including db_version
     assert (changes1 == changes1_2)