Race fixes

matrix-org · Nov 17, 2023 · c688e5d · c688e5d
1 parent 3a2e9ef
commit c688e5d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/tests/membership_acls_test.go b/tests/membership_acls_test.go
@@ -54,10 +54,13 @@ func TestAliceBobEncryptionWorks(t *testing.T) {
 		// -----------------
 
 		// login both clients first, so OTKs etc are uploaded.
-		alice := MustLoginClient(t, clientTypeA, api.FromComplementClient(csapiAlice, "complement-crypto-password"), ss)
-		defer alice.Close(t)
+		// We sign in Bob first to try to encourage Alice to get a device list
+		// update with bob's device keys, which will be important when Alice
+		// sends the event.
 		bob := MustLoginClient(t, clientTypeB, api.FromComplementClient(csapiBob, "complement-crypto-password"), ss)
 		defer bob.Close(t)
+		alice := MustLoginClient(t, clientTypeA, api.FromComplementClient(csapiAlice, "complement-crypto-password"), ss)
+		defer alice.Close(t)
 
 		// Alice starts syncing
 		aliceStopSyncing := alice.StartSyncing(t)
@@ -281,10 +284,11 @@ func TestOnRejoinBobCanSeeButNotDecryptHistoryInPublicRoom(t *testing.T) {
 		// -----------------
 
 		// login both clients first, so OTKs etc are uploaded.
-		alice := MustLoginClient(t, clientTypeA, api.FromComplementClient(csapiAlice, "complement-crypto-password"), ss)
-		defer alice.Close(t)
+		// Similarly to TestAliceBobEncryptionWorks, log Bob in first.
 		bob := MustLoginClient(t, clientTypeB, api.FromComplementClient(csapiBob, "complement-crypto-password"), ss)
 		defer bob.Close(t)
+		alice := MustLoginClient(t, clientTypeA, api.FromComplementClient(csapiAlice, "complement-crypto-password"), ss)
+		defer alice.Close(t)
 
 		// Alice and Bob start syncing. Both are in the same room
 		aliceStopSyncing := alice.StartSyncing(t)