diff options
author | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
---|---|---|
committer | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
commit | 9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6 (patch) | |
tree | 1034b986ea37a081707b489cb3ebe6e4d584defe /tests/util | |
parent | Make the logging level configurable (diff) | |
parent | missing word :| (diff) | |
download | synapse-9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6.tar.xz |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'tests/util')
-rw-r--r-- | tests/util/test_file_consumer.py | 2 | ||||
-rw-r--r-- | tests/util/test_linearizer.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/util/test_file_consumer.py b/tests/util/test_file_consumer.py index 76e2234255..d6e1082779 100644 --- a/tests/util/test_file_consumer.py +++ b/tests/util/test_file_consumer.py @@ -20,7 +20,7 @@ from mock import NonCallableMock from synapse.util.file_consumer import BackgroundFileConsumer from tests import unittest -from StringIO import StringIO +from six import StringIO import threading diff --git a/tests/util/test_linearizer.py b/tests/util/test_linearizer.py index 793a88e462..4865eb4bc6 100644 --- a/tests/util/test_linearizer.py +++ b/tests/util/test_linearizer.py @@ -18,6 +18,7 @@ from tests import unittest from twisted.internet import defer from synapse.util.async import Linearizer +from six.moves import range class LinearizerTestCase(unittest.TestCase): @@ -58,7 +59,7 @@ class LinearizerTestCase(unittest.TestCase): logcontext.LoggingContext.current_context(), lc) func(0, sleep=True) - for i in xrange(1, 100): + for i in range(1, 100): func(i) return func(1000) |