diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-15 10:54:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-15 10:54:04 +0100 |
| commit | a2c4f3f150f63c720370f6882da804c8ac20fd69 (patch) | |
| tree | 3b1465eeecbc337c70a3313441380f4a126df7d3 /tests | |
| parent | Remove race condition (diff) | |
| download | synapse-a2c4f3f150f63c720370f6882da804c8ac20fd69.tar.xz | |
Fix daedlock
Diffstat (limited to 'tests')
| -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): |