diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
| commit | f6583796feeff5a50c0988ce674a1ab861b14e34 (patch) | |
| tree | 47f9d5934440eef201c6ab65a0fb8df06631d18d /tests/storage | |
| parent | Rearrange storage modules (diff) | |
| parent | Merge pull request #113 from matrix-org/store_rearrangement (diff) | |
| download | synapse-f6583796feeff5a50c0988ce674a1ab861b14e34.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test_base.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_room.py | 2 |
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}, |