Merge lp:~cjwatson/rabbitfixture/py3 into lp:rabbitfixture

[Colin Watson]

Add Python 3 support.

This also involves porting from amqplib to the better-maintained amqp. I've tested this with a Launchpad branch which I've also ported from amqplib to amqp, and it seems to be behaving itself in the relevant subset of the test suite.

[lp:~cjwatson/rabbitfixture/py3]

41. By Colin Watson on 2018-03-12

Require amqp >= 2.0.0, since that has the big async refactoring.

[Free Ekanayaka (free.ekanayaka)]

+1 from me as long as the test suite works, as it seems you have checked.

review: Approve

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2016-08-30 09:23:00 +0000
+++ rabbitfixture/server.py	2018-03-12 11:54:53 +0000
@@ -3,6 +3,8 @@
 
 """Test server fixtures for RabbitMQ."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 __all__ = [
@@ -20,7 +22,7 @@
     import subprocess
 import time
 
-from amqplib import client_0_8 as amqp
+import amqp
 from fixtures import (
     EnvironmentVariableFixture,
     Fixture,
@@ -198,11 +200,11 @@
     def _get_errors(self):
         """Yield all errors as UTF-8 encoded text."""
         for error in self._errors:
-            if type(error) is unicode:
+            if isinstance(error, bytes):
+                yield error
+            else:
                 yield error.encode('utf8')
-            else:
-                yield error
-            yield '\n'
+            yield b'\n'
 
     @property
     def ctlbin(self):
@@ -223,7 +225,7 @@
         ctl = subprocess.Popen(
             (self.ctlbin, "-n", nodename) + command, env=env,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-            preexec_fn=preexec_fn)
+            preexec_fn=preexec_fn, universal_newlines=True)
         try:
             outstr, errstr = ctl.communicate(timeout=timeout)
         except subprocess.TimeoutExpired:
@@ -257,9 +259,11 @@
         :raises socket.error: If the connection cannot be made.
         """
         host_port = "%s:%s" % (self.config.hostname, self.config.port)
-        return amqp.Connection(
+        connection = amqp.Connection(
             host=host_port, userid="guest",
-            password="guest", virtual_host="/", insist=False)
+            password="guest", virtual_host="/")
+        connection.connect()
+        return connection
 
 
 class RabbitServerRunner(Fixture):

=== modified file 'rabbitfixture/tests/test_server.py'
--- rabbitfixture/tests/test_server.py	2016-08-30 09:23:00 +0000
+++ rabbitfixture/tests/test_server.py	2018-03-12 11:54:53 +0000
@@ -3,6 +3,8 @@
 
 """Tests for the Rabbit fixture."""
 
+from __future__ import absolute_import, print_function
+
 __metaclass__ = type
 
 import os.path
@@ -10,7 +12,7 @@
 import stat
 from textwrap import dedent
 
-from amqplib import client_0_8 as amqp
+import amqp
 from fixtures import (
     EnvironmentVariableFixture,
     MonkeyPatch,
@@ -22,6 +24,7 @@
     RabbitServerEnvironment,
     RabbitServerResources,
     )
+import six
 from testtools import TestCase
 from testtools.testcase import gather_details
 
@@ -43,9 +46,11 @@
                 connect_arguments = {
                     "host": 'localhost:%s' % fixture.config.port,
                     "userid": "guest", "password": "guest",
-                    "virtual_host": "/", "insist": False,
+                    "virtual_host": "/",
                     }
-                amqp.Connection(**connect_arguments).close()
+                connection = amqp.Connection(**connect_arguments)
+                connection.connect()
+                connection.close()
                 # And get a log file.
                 log = fixture.runner.getDetails()["server.log"]
                 # Which shouldn't blow up on iteration.
@@ -58,7 +63,8 @@
                 raise
 
         # The daemon should be closed now.
-        self.assertRaises(socket.error, amqp.Connection, **connect_arguments)
+        connection = amqp.Connection(**connect_arguments)
+        self.assertRaises(socket.error, connection.connect)
 
     def test_stop_hang(self):
         # If rabbitctl hangs on shutdown, the fixture eventually manages to
@@ -75,7 +81,7 @@
                 connect_arguments = {
                     "host": 'localhost:%s' % fixture.config.port,
                     "userid": "guest", "password": "guest",
-                    "virtual_host": "/", "insist": False,
+                    "virtual_host": "/",
                     }
 
                 self.useFixture(MonkeyPatch(
@@ -92,7 +98,8 @@
                 raise
 
         # The daemon should be closed now.
-        self.assertRaises(socket.error, amqp.Connection, **connect_arguments)
+        connection = amqp.Connection(**connect_arguments)
+        self.assertRaises(socket.error, connection.connect)
 
     def test_config(self):
         # The configuration can be passed in.
@@ -118,11 +125,11 @@
             self.assertEqual("localhost", resources.hostname)
             self.assertIsInstance(resources.port, int)
             self.assertIsInstance(resources.dist_port, int)
-            self.assertIsInstance(resources.homedir, (str, unicode))
-            self.assertIsInstance(resources.mnesiadir, (str, unicode))
-            self.assertIsInstance(resources.logfile, (str, unicode))
-            self.assertIsInstance(resources.nodename, (str, unicode))
-            self.assertIsInstance(resources.pluginsdir, (str, unicode))
+            self.assertIsInstance(resources.homedir, six.string_types)
+            self.assertIsInstance(resources.mnesiadir, six.string_types)
+            self.assertIsInstance(resources.logfile, six.string_types)
+            self.assertIsInstance(resources.nodename, six.string_types)
+            self.assertIsInstance(resources.pluginsdir, six.string_types)
             self.assertEqual(resources.pluginsfile, os.devnull)
 
     def test_passed_to_init(self):
@@ -133,7 +140,7 @@
         resources = RabbitServerResources(**args)
         for i in range(2):
             with resources:
-                for key, value in args.iteritems():
+                for key, value in args.items():
                     self.assertEqual(value, getattr(resources, key))
 
     def test_defaults_reallocated_after_teardown(self):

=== modified file 'setup.py'
--- setup.py	2016-09-05 15:18:29 +0000
+++ setup.py	2018-03-12 11:54:53 +0000
@@ -7,7 +7,7 @@
 
 
 install_requires = [
-    'amqplib >= 0.6.1',
+    'amqp >= 2.0.0',
     'fixtures >= 0.3.6',
     'setuptools',
     'testtools >= 0.9.12',
@@ -23,4 +23,9 @@
     include_package_data=True,
     zip_safe=False,
     description='Magic.',
-    install_requires=install_requires)
+    install_requires=install_requires,
+    extras_require={
+        'test': [
+            'six',
+            ],
+        })