From 95dacce13e704e83d640e488ff50ccd16ca8411b Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Tue, 25 Jun 2013 14:22:49 +0100
Subject: [PATCH] Fixes test suite failures when logging enabled.  Closes #227

---
 Changelog                            | 2 ++
 kombu/tests/transport/test_pyamqp.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Changelog b/Changelog
index e61a57fe..d47e8ce1 100644
--- a/Changelog
+++ b/Changelog
@@ -10,6 +10,8 @@
 ======
 :release-date: 2013-06-25 16:00 P.M BST
 
+- Now depends on amqp 1.0.12 (Py3 compatibility issues).
+
 - MongoDB:  Removed cause of a "database name in URI is being ignored"
   warning.
 
diff --git a/kombu/tests/transport/test_pyamqp.py b/kombu/tests/transport/test_pyamqp.py
index 745c0142..51dfd532 100644
--- a/kombu/tests/transport/test_pyamqp.py
+++ b/kombu/tests/transport/test_pyamqp.py
@@ -3,8 +3,10 @@ from __future__ import with_statement
 
 import sys
 
+from functools import partial
 from mock import patch
 from nose import SkipTest
+from itertools import count
 
 try:
     import amqp    # noqa
@@ -13,6 +15,7 @@ except ImportError:
 else:
     from kombu.transport import pyamqp
 from kombu import Connection
+from kombu.utils.compat import next
 
 from kombu.tests.utils import TestCase
 from kombu.tests.utils import mask_modules, Mock
@@ -43,6 +46,7 @@ class test_Channel(TestCase):
                 pass
 
         self.conn = Mock()
+        self.conn._get_free_channel_id.side_effect = partial(next, count(0))
         self.conn.channels = {}
         self.channel = Channel(self.conn, 0)