diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-07 13:13:43 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-07 13:13:43 +0000 |
| commit | d547afeae0f1e96aafeaa42031e3372c2d95d5a6 (patch) | |
| tree | 71f661a776fd5ffadcfc570fb433408bb3b8fb19 /tests | |
| parent | Merge pull request #428 from matrix-org/pusher_api_log (diff) | |
| parent | Merge pull request #426 from OlegGirko/fix_mock_import (diff) | |
| download | synapse-d547afeae0f1e96aafeaa42031e3372c2d95d5a6.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/storage/test_events.py | 2 |
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 |