summaryrefslogtreecommitdiff
path: root/kombu/tests/test_connection.py
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-10-03 15:05:30 +0100
committerAsk Solem <ask@celeryproject.org>2013-10-03 15:05:30 +0100
commit13e2de161be2185d289a81dfa1085d8a4f85c639 (patch)
tree2e4e09043dd8f683fff9d192c09184e5024f649d /kombu/tests/test_connection.py
parent138bf3f822f6b5b39390febca2d8cdef109941ae (diff)
downloadkombu-13e2de161be2185d289a81dfa1085d8a4f85c639.tar.gz
Replaces URI_PASSTHROUGH global with Transport.can_parse_url
Diffstat (limited to 'kombu/tests/test_connection.py')
-rw-r--r--kombu/tests/test_connection.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/kombu/tests/test_connection.py b/kombu/tests/test_connection.py
index d71bac77..58790db0 100644
--- a/kombu/tests/test_connection.py
+++ b/kombu/tests/test_connection.py
@@ -210,9 +210,10 @@ class test_Connection(Case):
self.assertIsNone(connection._transport)
def test_uri_passthrough(self):
- from kombu import connection as mod
- prev, mod.URI_PASSTHROUGH = mod.URI_PASSTHROUGH, set(['foo'])
- try:
+ transport = Mock(name='transport')
+ with patch('kombu.connection.get_transport_cls') as gtc:
+ gtc.return_value = transport
+ transport.can_parse_url = True
with patch('kombu.connection.parse_url') as parse_url:
c = Connection('foo+mysql://some_host')
self.assertEqual(c.transport_cls, 'foo')
@@ -224,8 +225,6 @@ class test_Connection(Case):
self.assertEqual(c.transport_cls, 'foo')
self.assertFalse(parse_url.called)
self.assertEqual(c.hostname, 'mysql://some_host')
- finally:
- mod.URI_PASSTHROUGH = prev
c = Connection('pyamqp+sqlite://some_host')
self.assertTrue(c.as_uri().startswith('pyamqp+'))