Python3 unit tests

Modules/_librabbitmq/connection.c

@@ -1654,8 +1654,7 @@ PyRabbitMQ_Connection_queue_declare(PyRabbitMQ_Connection *self,
         goto bail;
 
     if ((ret = PyTuple_New(3)) == NULL) goto bail;
-    PyTuple_SET_ITEM(ret, 0, PyBytes_FromStringAndSize(ok->queue.bytes,
-                                                        (Py_ssize_t)ok->queue.len));
+    PyTuple_SET_ITEM(ret, 0, PySTRING_FROM_AMQBYTES(ok->queue));
     PyTuple_SET_ITEM(ret, 1, PyInt_FromLong((long)ok->message_count));
     PyTuple_SET_ITEM(ret, 2, PyInt_FromLong((long)ok->consumer_count));
     return ret;

Modules/_librabbitmq/connection.h

@@ -89,10 +89,10 @@ buffer_toMemoryView(char *buf, Py_ssize_t buf_len) {
 
 #if PY_MAJOR_VERSION == 2
 #  define PySTRING_FROM_AMQBYTES(member)                                        \
-        PyString_FromStringAndSize(member.bytes, (Py_ssize_t)member.len);
+        PyString_FromStringAndSize((member).bytes, (Py_ssize_t)(member).len)
 #else
 #  define PySTRING_FROM_AMQBYTES(member)                                        \
-        PyUnicode_FromStringAndSize(member.bytes, (Py_ssize_t)member.len);
+        PyUnicode_FromStringAndSize((member).bytes, (Py_ssize_t)(member).len)
 #endif
 
 

funtests/config.py

@@ -7,7 +7,7 @@
 BROKER_PASSWORD = os.environ.get('BROKER_PASSWORD', 'guest')
 
 from functools import partial
-from unittest2 import TestCase
+from unittest import TestCase
 from uuid import uuid4
 
 

funtests/setup.py

@@ -45,7 +45,6 @@ def run(self, *args, **kwargs):
     build_requires=[
         "nose",
         "nose-cover3",
-        "unittest2",
         "coverage>=3.0",
     ],
     classifiers=[

librabbitmq/tests/test_functional.py

@@ -1,8 +1,9 @@
 from __future__ import absolute_import
-from __future__ import with_statement
+
+from six.moves import xrange
 
 import socket
-import unittest2 as unittest
+import unittest
 
 from librabbitmq import Message, Connection, ConnectionError, ChannelError
 TEST_QUEUE = 'pyrabbit.testq'
@@ -86,7 +87,7 @@ def cb(x):
         for i in xrange(100):
             self.connection.drain_events(timeout=0.2)
 
-        self.assertEquals(len(messages), 100)
+        self.assertEqual(len(messages), 100)
 
     def test_timeout(self):
         """Check that our ``drain_events`` call actually times out if
@@ -110,7 +111,7 @@ def cb(x):
 
         with self.assertRaises(socket.timeout):
             self.connection.drain_events(timeout=0.1)
-        self.assertEquals(len(messages), 1)
+        self.assertEqual(len(messages), 1)
 
     def tearDown(self):
         if self.channel and self.connection.connected:

requirements/README.rst

@@ -14,10 +14,6 @@ Index
 
     Requirements needed to run the full unittest suite.
 
-* :file:`requirements/test3.txt`
-
-    Requirements needed to run the full unittest suite on Python 3.
-
 * :file:`requirements/test-ci.txt`
 
     Extra test requirements required by the CI suite (Tox).
@@ -41,12 +37,3 @@ Running the tests
 
     $ pip install -U -r requirements/default.txt
     $ pip install -U -r requirements/test.txt
-
-
-Running the tests on Python 3
------------------------------
-
-::
-
-    $ pip install -U -r requirements/default.txt
-    $ pip install -U -r requirements/test3.txt

requirements/default.txt

@@ -1 +1,2 @@
+six>=1.0.0
 amqp>=1.4.6

requirements/test.txt

@@ -1,3 +1,3 @@
-unittest2>=0.4.0
 nose
 mock
+six

setup.py

@@ -195,6 +195,13 @@ def find_make(alt=('gmake', 'gnumake', 'make', 'nmake')):
         sys.argv[:_index] + ['build', 'bdist_egg'] + sys.argv[_index + 1:]
     )
 
+# 'test doesn't always call build for some reason
+if 'test' in sys.argv and 'build' not in sys.argv:
+    _index = sys.argv.index('test')
+    sys.argv[:] = (
+        sys.argv[:_index] + ['build', 'test'] + sys.argv[_index + 1:]
+    )
+
 setup(
     name='librabbitmq',
     version=version,