Merge lp:~allenap/rabbitfixture/details-breakage-bug-851813 into lp:rabbitfixture

[Gavin Panella]

Handle the fixture lifecycle entirely in test_start_check_shutdown. Previously the fixture was torn down explicitly within the test, and the test harness later failed during clean-up when trying to access a defunct fixture detail.

The bug report has a description of the problem. In addition, I needed to bump up the testtools version required because of changed behaviour of gather_details() between 0.9.11 and 0.9.12.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'rabbitfixture/tests/test_server.py'
--- rabbitfixture/tests/test_server.py	2011-07-07 07:04:43 +0000
+++ rabbitfixture/tests/test_server.py	2011-09-16 12:11:12 +0000
@@ -16,6 +16,7 @@
     RabbitServerResources,
     )
 from testtools import TestCase
+from testtools.testcase import gather_details
 
 
 class TestRabbitFixture(TestCase):
@@ -28,21 +29,26 @@
         self.useFixture(EnvironmentVariableFixture('HOME', '/nonsense/value'))
 
     def test_start_check_shutdown(self):
-        fixture = self.useFixture(RabbitServer())
-
-        # We can connect.
-        connect_arguments = {
-            "host": 'localhost:%s' % fixture.config.port,
-            "userid": "guest", "password": "guest",
-            "virtual_host": "/", "insist": False,
-            }
-        amqp.Connection(**connect_arguments).close()
-        # And get a log file.
-        log = fixture.runner.getDetails()["server.log"]
-        # Which shouldn't blow up on iteration.
-        list(log.iter_text())
-
-        fixture.cleanUp()
+        # The fixture correctly starts and stops RabbitMQ.
+        with RabbitServer() as fixture:
+            try:
+                # We can connect.
+                connect_arguments = {
+                    "host": 'localhost:%s' % fixture.config.port,
+                    "userid": "guest", "password": "guest",
+                    "virtual_host": "/", "insist": False,
+                    }
+                amqp.Connection(**connect_arguments).close()
+                # And get a log file.
+                log = fixture.runner.getDetails()["server.log"]
+                # Which shouldn't blow up on iteration.
+                list(log.iter_text())
+            except Exception:
+                # self.useFixture() is not being used because we want to
+                # handle the fixture's lifecycle, so we must also be
+                # responsible for propagating fixture details.
+                gather_details(fixture.getDetails(), self.getDetails())
+                raise
 
         # The daemon should be closed now.
         self.assertRaises(socket.error, amqp.Connection, **connect_arguments)
 
=== modified file 'setup.py'
--- setup.py	2011-09-09 13:49:24 +0000
+++ setup.py	2011-09-16 12:11:12 +0000
@@ -16,5 +16,5 @@
         'amqplib >= 0.6.1',
         'fixtures >= 0.3.6',
         'setuptools',
-        'testtools >= 0.9.11',
+        'testtools >= 0.9.12',
         ])