diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-08 10:50:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-08 10:50:31 +0100 |
| commit | 5c7311515537832fcc462cc857316d62c36ee54d (patch) | |
| tree | 715ef91066fd1c785cab632257063365835c9b58 /tests | |
| parent | Note that v0.15.x was never released (diff) | |
| parent | Merge pull request #850 from matrix-org/erikj/gc_threshold (diff) | |
| download | synapse-5c7311515537832fcc462cc857316d62c36ee54d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/storage/test_appservice.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py index 5734198121..3e2862daae 100644 --- a/tests/storage/test_appservice.py +++ b/tests/storage/test_appservice.py @@ -357,7 +357,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.TestCase): other_events = [Mock(event_id="e5"), Mock(event_id="e6")] # we aren't testing store._base stuff here, so mock this out - self.store._get_events_txn = Mock(return_value=events) + self.store._get_events = Mock(return_value=events) yield self._insert_txn(self.as_list[1]["id"], 9, other_events) yield self._insert_txn(service.id, 10, events) |