diff options
author | Erik Johnston <erik@matrix.org> | 2016-06-07 11:07:27 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-06-07 11:07:27 +0100 |
commit | dbd788c2621d3f6af3dfe1624f81858ea561fcc5 (patch) | |
tree | 99a1c75673f8dc629b1405a1a1ebf5caa3823468 /tests | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings (diff) | |
parent | Fix AS retries, but with correct ordering (diff) | |
download | synapse-erikj/timings.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings github/erikj/timings erikj/timings
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 f44c4870e3..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 = 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) |