Merge pull request #278 from matrix-org/babolivier/test_replication

Compare the output to the input when testing replication, not the other way around
matrix-org · Feb 26, 2020 · d4c27a9 · d4c27a9
2 parents 8994c47 + f99c9f1
commit d4c27a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.d/278.misc b/changelog.d/278.misc
@@ -0,0 +1 @@
+Make replication tests more reliable.
diff --git a/tests/test_replication.py b/tests/test_replication.py
@@ -96,11 +96,15 @@ def test_incoming_replication(self):
         cur = self.sydent.db.cursor()
         res = cur.execute("SELECT originId, sgAssoc FROM global_threepid_associations")
 
+        res_assocs = {}
         for row in res.fetchall():
             originId = row[0]
             signed_assoc = json.loads(row[1])
 
-            self.assertDictEqual(signed_assoc, signed_assocs[originId])
+            res_assocs[originId] = signed_assoc
+
+        for assoc_id, signed_assoc in signed_assocs.items():
+            self.assertDictEqual(signed_assoc, res_assocs[assoc_id])
 
     def test_outgoing_replication(self):
         """Make a fake peer and associations and make sure Sydent tries to push to it.