Tests passing

kombu/tests/mocks.py

@@ -22,7 +22,7 @@ class Message(base.Message):
 class Channel(base.StdChannel):
     open = True
     throw_decode_error = False
-    _ids = count(1)
+    _ids = count(1).next
 
     def __init__(self, connection):
         self.connection = connection
@@ -30,7 +30,7 @@ class Channel(base.StdChannel):
         self.deliveries = count(1).next
         self.to_deliver = []
         self.events = {'basic_return': set()}
-        self.channel_id = next(self._ids)
+        self.channel_id = self._ids()
 
     def _called(self, name):
         self.called.append(name)

kombu/tests/test_connection.py

@@ -291,7 +291,7 @@ class test_Connection(TestCase):
         c.maybe_switch_next()
         self.assertFalse(c._closed)
         self.assertEqual(c.hostname, 'foo')
-        self.assertIn(c.transport_cls, ('librabbitmq', 'pyamqp'))
+        self.assertIn(c.transport_cls, ('librabbitmq', 'pyamqp', 'amqp'))
 
     def test_heartbeat_check(self):
         c = Connection(transport=Transport)