From 08ade8a57d713d17fc73fef87a593392ccb1100f Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Mon, 14 Oct 2013 16:09:43 +0100 Subject: [PATCH] Fixes for funtests --- funtests/tests/test_django.py | 2 +- funtests/transport.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/funtests/tests/test_django.py b/funtests/tests/test_django.py index 9f41bfc6..7858d1f0 100644 --- a/funtests/tests/test_django.py +++ b/funtests/tests/test_django.py @@ -1,6 +1,6 @@ from nose import SkipTest -from kombu.tests.utils import redirect_stdouts +from kombu.tests.case import redirect_stdouts from funtests import transport diff --git a/funtests/transport.py b/funtests/transport.py index 0be48479..18872336 100644 --- a/funtests/transport.py +++ b/funtests/transport.py @@ -14,7 +14,7 @@ from nose import SkipTest from kombu import Connection from kombu import Exchange, Queue from kombu.five import range -from kombu.tests.utils import skip_if_quick +from kombu.tests.case import skip_if_quick if sys.version_info >= (2, 5): from hashlib import sha256 as _digest @@ -191,7 +191,7 @@ class TransportCase(unittest.TestCase): for msg in consumeN(self.connection, consumer, n)] self.assertEqual(len(received), n) ordering = [i for i, _ in received] - if ordering != range(n) and not self.suppress_disorder_warning: + if ordering != list(range(n)) and not self.suppress_disorder_warning: warnings.warn( '%s did not deliver messages in FIFO order: %r' % ( self.transport, ordering))