summary refs log tree commit diff
path: root/tests/util/test_linearizer.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-27 12:54:43 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-27 12:54:43 +0100
commit3d1ae6139918ecb013c576a5eb0ed8e06103ebf6 (patch)
tree5056d9455cb6a0d72da1dc2b5dcf1a98c6282c6e /tests/util/test_linearizer.py
parentBackport deferred.addTimeout (diff)
parentMerge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff)
downloadsynapse-3d1ae6139918ecb013c576a5eb0ed8e06103ebf6.tar.xz
Merge branch 'develop' into rav/deferred_timeout
Diffstat (limited to 'tests/util/test_linearizer.py')
-rw-r--r--tests/util/test_linearizer.py3
1 files changed, 2 insertions, 1 deletions
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)