tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

fix known broken test

Browse source
This commit is contained in:
Neil Johnson 2018-08-01 11:48:37 +01:00
parent 0aba3d361a
commit 4e6e00152c
1 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/storage/test__init__.py
View file

@ -15,7 +15,7 @@
from twisted.internet import defer from twisted.internet import defer
import tests.unittest
import tests.utils import tests.utils
@ -33,27 +33,25 @@ class InitTestCase(tests.unittest.TestCase):
self.store = hs.get_datastore() self.store = hs.get_datastore()
self.clock = hs.get_clock() self.clock = hs.get_clock()
@defer.inlineCallbacks
def test_count_monthly_users(self): def test_count_monthly_users(self):
count = self.store.count_monthly_users() count = yield self.store.count_monthly_users()
self.assertEqual(0, count) self.assertEqual(0, count)
self._insert_user_ips("@user:server1") yield self._insert_user_ips("@user:server1")
self._insert_user_ips("@user:server2") yield self._insert_user_ips("@user:server2")
count = self.store.count_monthly_users() count = yield self.store.count_monthly_users()
self.assertEqual(2, count) self.assertEqual(2, count)
@defer.inlineCallbacks
def _insert_user_ips(self, user): def _insert_user_ips(self, user):
""" """
Helper function to populate user_ips without using batch insertion infra Helper function to populate user_ips without using batch insertion infra
args: args:
user (str): specify username i.e. @user:server.com user (str): specify username i.e. @user:server.com
""" """
try: yield self.store._simple_upsert(
txn = self.store.db_conn.cursor()
self.store.database_engine.lock_table(txn, "user_ips")
self.store._simple_upsert_txn(
txn,
table="user_ips", table="user_ips",
keyvalues={ keyvalues={
"user_id": user, "user_id": user,
@ -64,8 +62,5 @@ class InitTestCase(tests.unittest.TestCase):
}, },
values={ values={
"last_seen": self.clock.time_msec(), "last_seen": self.clock.time_msec(),
}, }
lock=False,
) )
finally:
txn.close()