summary refs log tree commit diff
path: root/tests/test_distributor.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-15 09:46:33 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-15 09:46:33 +0100
commitbf6fa6dd3dbaf929e2a15c1100ac6650aed65944 (patch)
treebedb2fad2cb22eb99189879adf04258a0076f46e /tests/test_distributor.py
parentUpdated spec and api docs to desired new format. (diff)
parentBF: presence and eventMap were not reset at logout. (diff)
downloadsynapse-bf6fa6dd3dbaf929e2a15c1100ac6650aed65944.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes
Diffstat (limited to 'tests/test_distributor.py')
-rw-r--r--tests/test_distributor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_distributor.py b/tests/test_distributor.py

index 04933f0ecf..39c5b8dff2 100644 --- a/tests/test_distributor.py +++ b/tests/test_distributor.py
@@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from tests import unittest from twisted.internet import defer -from twisted.trial import unittest from mock import Mock, patch