diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-26 16:03:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-26 16:03:32 +0100 |
| commit | 6d1dea337b8ae64ddfe4c1627014d09963388b0d (patch) | |
| tree | c5cefd5b0334185780ffa8d391cb2d2f70c003af /tests/storage/test_base.py | |
| parent | Changelog (diff) | |
| parent | changelog (diff) | |
| download | synapse-6d1dea337b8ae64ddfe4c1627014d09963388b0d.tar.xz | |
Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse v0.9.1
Diffstat (limited to 'tests/storage/test_base.py')
| -rw-r--r-- | tests/storage/test_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py index 8c348ecc95..8573f18b55 100644 --- a/tests/storage/test_base.py +++ b/tests/storage/test_base.py @@ -33,8 +33,9 @@ class SQLBaseStoreTestCase(unittest.TestCase): def setUp(self): self.db_pool = Mock(spec=["runInteraction"]) self.mock_txn = Mock() - self.mock_conn = Mock(spec_set=["cursor"]) + self.mock_conn = Mock(spec_set=["cursor", "rollback", "commit"]) self.mock_conn.cursor.return_value = self.mock_txn + self.mock_conn.rollback.return_value = None # Our fake runInteraction just runs synchronously inline def runInteraction(func, *args, **kwargs): |