summary refs log tree commit diff
path: root/tests/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-20 14:59:48 +0000
committerErik Johnston <erik@matrix.org>2015-03-20 15:05:10 +0000
commit7e282a53a542832f44119b886b2d4d474bbe1d0f (patch)
tree1d60e0d565175ea7a2d2f10b89b81faa8139a65c /tests/storage
parentRearrange storage modules (diff)
downloadsynapse-7e282a53a542832f44119b886b2d4d474bbe1d0f.tar.xz
Tidy up _simple_... methods
Diffstat (limited to 'tests/storage')
-rw-r--r--tests/storage/test_base.py2
-rw-r--r--tests/storage/test_room.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py

index 55fbffa7a2..7f5845cf0c 100644 --- a/tests/storage/test_base.py +++ b/tests/storage/test_base.py
@@ -180,7 +180,7 @@ class SQLBaseStoreTestCase(unittest.TestCase): self.mock_txn.rowcount = 1 self.mock_txn.fetchone.return_value = ("Old Value",) - ret = yield self.datastore._simple_update_one( + ret = yield self.datastore._simple_selectupdate_one( table="tablename", keyvalues={"keycol": "TheKey"}, updatevalues={"columname": "New Value"}, diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py
index c88dd446fb..ab7625a3ca 100644 --- a/tests/storage/test_room.py +++ b/tests/storage/test_room.py
@@ -44,7 +44,7 @@ class RoomStoreTestCase(unittest.TestCase): @defer.inlineCallbacks def test_get_room(self): - self.assertObjectHasAttributes( + self.assertDictContainsSubset( {"room_id": self.room.to_string(), "creator": self.u_creator.to_string(), "is_public": True},