Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_reserved_users

Browse Source 
Neil/fix postgres test initialise reserved users
This commit is contained in:
Neil Johnson 2018-08-14 16:40:11 +00:00 committed by GitHub
commit aa3220df6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3692.bugfix Normal file
View File

@ -0,0 +1 @@
Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users

2
synapse/storage/monthly_active_users.py
View File

@ -46,7 +46,7 @@ class MonthlyActiveUsersStore(SQLBaseStore):
tp["medium"], tp["address"] tp["medium"], tp["address"]
) )
if user_id: if user_id:
self.upsert_monthly_active_user(user_id) yield self.upsert_monthly_active_user(user_id)
reserved_user_list.append(user_id) reserved_user_list.append(user_id)
else: else:
logger.warning( logger.warning(

2
tests/handlers/test_sync.py
View File

@ -29,7 +29,7 @@ class SyncTestCase(tests.unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def setUp(self): def setUp(self):
self.hs = yield setup_test_homeserver() self.hs = yield setup_test_homeserver(self.addCleanup)
self.sync_handler = SyncHandler(self.hs) self.sync_handler = SyncHandler(self.hs)
self.store = self.hs.get_datastore() self.store = self.hs.get_datastore()

2
tests/storage/test_monthly_active_users.py
View File

@ -33,7 +33,7 @@ class MonthlyActiveUsersTestCase(tests.unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_initialise_reserved_users(self): def test_initialise_reserved_users(self):
self.hs.config.max_mau_value = 5
user1 = "@user1:server" user1 = "@user1:server"
user1_email = "user1@matrix.org" user1_email = "user1@matrix.org"
user2 = "@user2:server" user2 = "@user2:server"