diff options
| -rw-r--r-- | kombu/five.py | 5 | ||||
| -rw-r--r-- | kombu/tests/__init__.py | 2 | ||||
| -rw-r--r-- | kombu/tests/test_connection.py | 4 | ||||
| -rw-r--r-- | kombu/tests/test_utils.py | 1 | ||||
| -rw-r--r-- | kombu/tests/transport/test_redis.py | 2 | ||||
| -rw-r--r-- | kombu/tests/transport/virtual/test_base.py | 3 | ||||
| -rw-r--r-- | kombu/transport/virtual/__init__.py | 6 |
7 files changed, 16 insertions, 7 deletions
diff --git a/kombu/five.py b/kombu/five.py index 3107a71b..91739cd1 100644 --- a/kombu/five.py +++ b/kombu/five.py @@ -29,6 +29,11 @@ try: except ImportError: # pragma: no cover from UserDict import UserDict # noqa +try: + bytes_t = bytes +except NameError: + bytes_t = str # noqa + if PY3: import builtins diff --git a/kombu/tests/__init__.py b/kombu/tests/__init__.py index 6a13a750..ad8a62c3 100644 --- a/kombu/tests/__init__.py +++ b/kombu/tests/__init__.py @@ -6,6 +6,8 @@ import sys from kombu.exceptions import VersionMismatch +os.environ['KOMBU_UNITTEST'] = '1' + # avoid json implementation inconsistencies. try: import json # noqa diff --git a/kombu/tests/test_connection.py b/kombu/tests/test_connection.py index be195c64..1211e8e4 100644 --- a/kombu/tests/test_connection.py +++ b/kombu/tests/test_connection.py @@ -10,7 +10,7 @@ from nose import SkipTest from kombu import Connection, Consumer, Producer, parse_url from kombu.connection import Resource -from kombu.five import items +from kombu.five import items, range from .mocks import Transport from .utils import TestCase @@ -505,7 +505,7 @@ class ResourceCase(TestCase): return P = self.create_resource(10, 0) self.assertState(P, 10, 0) - chans = [P.acquire() for _ in xrange(10)] + chans = [P.acquire() for _ in range(10)] self.assertState(P, 0, 10) with self.assertRaises(P.LimitExceeded): P.acquire() diff --git a/kombu/tests/test_utils.py b/kombu/tests/test_utils.py index 9dda129c..39104a3d 100644 --- a/kombu/tests/test_utils.py +++ b/kombu/tests/test_utils.py @@ -14,7 +14,6 @@ else: from kombu import utils from kombu.five import string_t -from kombu.utils.compat import next from .utils import ( TestCase, diff --git a/kombu/tests/transport/test_redis.py b/kombu/tests/transport/test_redis.py index 71ffaf7f..fb71039b 100644 --- a/kombu/tests/transport/test_redis.py +++ b/kombu/tests/transport/test_redis.py @@ -131,7 +131,7 @@ class Client(object): filenos = count(30) def __init__(self, *args): - self._fileno = next(self.filenos()) + self._fileno = next(self.filenos) self.data = [] def fileno(self): diff --git a/kombu/tests/transport/virtual/test_base.py b/kombu/tests/transport/virtual/test_base.py index 8b6cff68..d20087c1 100644 --- a/kombu/tests/transport/virtual/test_base.py +++ b/kombu/tests/transport/virtual/test_base.py @@ -10,7 +10,6 @@ from kombu.transport import virtual from kombu.utils import uuid from kombu.compression import compress -from kombu.tests.compat import catch_warnings from kombu.tests.utils import TestCase from kombu.tests.utils import Mock, redirect_stdouts @@ -410,7 +409,7 @@ class test_Channel(TestCase): def test_lookup__undeliverable(self, n='test_lookup__undeliverable'): warnings.resetwarnings() - with catch_warnings(record=True) as log: + with warnings.catch_warnings(record=True) as log: self.assertListEqual( self.channel._lookup(n, n, 'ae.undeliver'), ['ae.undeliver'], diff --git a/kombu/transport/virtual/__init__.py b/kombu/transport/virtual/__init__.py index 74f60b6f..863fc77c 100644 --- a/kombu/transport/virtual/__init__.py +++ b/kombu/transport/virtual/__init__.py @@ -11,6 +11,7 @@ from __future__ import absolute_import, unicode_literals import base64 import socket +import os import sys import warnings @@ -35,6 +36,8 @@ if sys.version_info[0] == 3: else: ARRAY_TYPE_H = b'H' +KOMBU_UNITTEST = os.environ.get('KOMBU_UNITTEST') + UNDELIVERABLE_FMT = """\ Message could not be delivered: No queues bound to exchange {exchange!r} \ using binding key {routing_key!r}. @@ -191,7 +194,8 @@ class QoS(object): if not self.restore_at_shutdown: return elif not self.channel.do_restore or getattr(state, 'restored', None): - assert not state + if not KOMBU_UNITTEST: + assert not state return try: |