diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
| commit | d7ee7b589f0535c21301f38e93b0cabc0cf288d4 (patch) | |
| tree | fcd7d110dc66d5e175f1030d10e0bbd5624bbf3c /tests/storage/test_events.py | |
| parent | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) (diff) | |
| parent | Merge pull request #432 from matrix-org/pushrules_refactor (diff) | |
| download | synapse-d7ee7b589f0535c21301f38e93b0cabc0cf288d4.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'tests/storage/test_events.py')
| -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 |