summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-07 13:13:09 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-07 13:13:09 +0000
commitdd108286df7e6b5ca2e431aad0950ecab78323c3 (patch)
treec23a71592c61105e4f68036509bcefa7cbf85a26 /tests
parentMerge branch 'release-v0.11.1' of github.com:matrix-org/synapse (diff)
parentFix mock import in tests. (diff)
downloadsynapse-dd108286df7e6b5ca2e431aad0950ecab78323c3.tar.xz
Merge pull request #426 from OlegGirko/fix_mock_import
Fix mock import in tests.
Diffstat (limited to 'tests')
-rw-r--r--tests/storage/test_events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test_events.py b/tests/storage/test_events.py
index 313013009e..946cd3e9f2 100644
--- a/tests/storage/test_events.py
+++ b/tests/storage/test_events.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import uuid
-from mock.mock import Mock
+from mock import Mock
 from synapse.types import RoomID, UserID
 
 from tests import unittest