summary refs log tree commit diff
path: root/tests/storage/test_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 14:54:52 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 14:54:52 +0100
commitebfdd2eb5bd9c27ec25b365c544a458b4e92f157 (patch)
tree1a6d7abe69139aa3864af6ccbd0689c494c278b7 /tests/storage/test_base.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff)
parentMerge pull request #155 from matrix-org/erikj/perf (diff)
downloadsynapse-ebfdd2eb5bd9c27ec25b365c544a458b4e92f157.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'tests/storage/test_base.py')
-rw-r--r--tests/storage/test_base.py3
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):