1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-25 21:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race in unit tests

Browse Source
This commit is contained in:
Kegan Dougal 2022-03-02 10:49:29 +00:00
parent 00b3545b14
commit a4c918ee17
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keyserver/internal/device_list_update_test.go
View File

@ -87,6 +87,12 @@ func (d *mockDeviceListUpdaterDatabase) MarkDeviceListStale(ctx context.Context,
return nil return nil
} }
func (d *mockDeviceListUpdaterDatabase) isStale(userID string) bool {
d.mu.Lock()
defer d.mu.Unlock()
return d.staleUsers[userID]
}
// StoreRemoteDeviceKeys persists the given keys. Keys with the same user ID and device ID will be replaced. An empty KeyJSON removes the key // StoreRemoteDeviceKeys persists the given keys. Keys with the same user ID and device ID will be replaced. An empty KeyJSON removes the key
// for this (user, device). Does not modify the stream ID for keys. // for this (user, device). Does not modify the stream ID for keys.
func (d *mockDeviceListUpdaterDatabase) StoreRemoteDeviceKeys(ctx context.Context, keys []api.DeviceMessage, clear []string) error { func (d *mockDeviceListUpdaterDatabase) StoreRemoteDeviceKeys(ctx context.Context, keys []api.DeviceMessage, clear []string) error {
@ -169,7 +175,7 @@ func TestUpdateHavePrevID(t *testing.T) {
if !reflect.DeepEqual(db.storedKeys, []api.DeviceMessage{want}) { if !reflect.DeepEqual(db.storedKeys, []api.DeviceMessage{want}) {
t.Errorf("DB didn't store correct event, got %v want %v", db.storedKeys, want) t.Errorf("DB didn't store correct event, got %v want %v", db.storedKeys, want)
} }
if db.staleUsers[event.UserID] { if db.isStale(event.UserID) {
t.Errorf("%s incorrectly marked as stale", event.UserID) t.Errorf("%s incorrectly marked as stale", event.UserID)
} }
} }
@ -243,7 +249,7 @@ func TestUpdateNoPrevID(t *testing.T) {
}, },
} }
// Now we should have a fresh list and the keys and emitted something // Now we should have a fresh list and the keys and emitted something
if db.staleUsers[event.UserID] { if db.isStale(event.UserID) {
t.Errorf("%s still marked as stale", event.UserID) t.Errorf("%s still marked as stale", event.UserID)
} }
if !reflect.DeepEqual(producer.events, []api.DeviceMessage{want}) { if !reflect.DeepEqual(producer.events, []api.DeviceMessage{want}) {
@ -304,7 +310,7 @@ func TestDebounce(t *testing.T) {
} }
// user should be marked as stale // user should be marked as stale
if !db.staleUsers[userID] { if !db.isStale(userID) {
t.Errorf("user %s not marked as stale", userID) t.Errorf("user %s not marked as stale", userID)
} }
// now send the response over federation // now send the response over federation
@ -330,7 +336,7 @@ func TestDebounce(t *testing.T) {
wg.Wait() wg.Wait()
// user is no longer stale now // user is no longer stale now
if db.staleUsers[userID] { if db.isStale(userID) {
t.Errorf("user %s is marked as stale", userID) t.Errorf("user %s is marked as stale", userID)
} }
} }