diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-09-15 09:46:33 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-09-15 09:46:33 +0100 |
| commit | bf6fa6dd3dbaf929e2a15c1100ac6650aed65944 (patch) | |
| tree | bedb2fad2cb22eb99189879adf04258a0076f46e /tests/test_distributor.py | |
| parent | Updated spec and api docs to desired new format. (diff) | |
| parent | BF: presence and eventMap were not reset at logout. (diff) | |
| download | synapse-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.py | 2 |
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 |