Merge lp:~allenap/launchpad/add-rabbit-service-config-bug-803043 into lp:launchpad

[Gavin Panella]

[r=allenap][bug=803043] Move the Launchpad-specific parts of the RabbitServer fixture back from rabbitfixture into Launchpad.

Adds a RabbitServer subclass to the Launchpad tree, based on rabbitfixture's. It creates a service_config object in the same place as rabbitfixture did before version 0.2.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2011-07-04 03:10:41 +0000
+++ lib/canonical/testing/layers.py	2011-07-05 16:44:58 +0000
@@ -61,7 +61,6 @@
 import socket
 import subprocess
 import sys
-import tempfile
 from textwrap import dedent
 import threading
 import time
@@ -75,9 +74,7 @@
     Fixture,
     MonkeyPatch,
     )
-from lazr.restful.utils import safe_hasattr
 import psycopg2
-from rabbitfixture.server import RabbitServer
 from storm.zope.interfaces import IZStorm
 import transaction
 import wsgi_intercept
@@ -98,7 +95,6 @@
 from zope.security.management import getSecurityPolicy
 from zope.security.simplepolicies import PermissiveSecurityPolicy
 from zope.server.logger.pythonlogger import PythonLogger
-from zope.testing.testrunner.runner import FakeInputContinueGenerator
 
 from canonical.config import (
     CanonicalConfig,
@@ -131,7 +127,6 @@
     register_launchpad_request_publication_factories,
     )
 import canonical.launchpad.webapp.session
-from canonical.launchpad.webapp.vhosts import allvhosts
 from canonical.lazr import pidfile
 from canonical.lazr.testing.layers import MockRootFolder
 from canonical.lazr.timeout import (
@@ -156,6 +151,7 @@
     login,
     logout,
     )
+from lp.testing.fixture import RabbitServer
 from lp.testing.pgsql import PgTestSetup
 
 
@@ -733,8 +729,8 @@
         if os.environ.get('LP_TEST_INSTANCE'):
             template_name = '_'.join([LaunchpadTestSetup.template,
                 os.environ.get('LP_TEST_INSTANCE')])
-            cls._db_template_fixture = LaunchpadTestSetup(dbname=template_name,
-                reset_sequences_sql=reset_sequences_sql)
+            cls._db_template_fixture = LaunchpadTestSetup(
+                dbname=template_name, reset_sequences_sql=reset_sequences_sql)
             cls._db_template_fixture.setUp()
         else:
             template_name = LaunchpadTestSetup.template

=== modified file 'lib/lp/testing/fixture.py'
--- lib/lp/testing/fixture.py	2011-07-05 16:44:57 +0000
+++ lib/lp/testing/fixture.py	2011-07-05 16:44:58 +0000
@@ -5,12 +5,16 @@
 
 __metaclass__ = type
 __all__ = [
+    'RabbitServer',
     'ZopeAdapterFixture',
     'ZopeEventHandlerFixture',
     'ZopeViewReplacementFixture',
     ]
 
+from textwrap import dedent
+
 from fixtures import Fixture
+import rabbitfixture.server
 from zope.component import (
     getGlobalSiteManager,
     provideHandler,
@@ -24,6 +28,24 @@
     )
 
 
+class RabbitServer(rabbitfixture.server.RabbitServer):
+    """A RabbitMQ server fixture with Launchpad-specific config.
+
+    :ivar service_config: A snippet of .ini that describes the `rabbitmq`
+        configuration.
+    """
+
+    def setUp(self):
+        super(RabbitServer, self).setUp()
+        self.config.service_config = dedent("""\
+            [rabbitmq]
+            host: localhost:%d
+            userid: guest
+            password: guest
+            virtual_host: /
+            """ % self.config.port)
+
+
 class ZopeAdapterFixture(Fixture):
     """A fixture to register and unregister an adapter."""
 

=== modified file 'lib/lp/testing/tests/test_fixture.py'
--- lib/lp/testing/tests/test_fixture.py	2011-07-05 16:44:57 +0000
+++ lib/lp/testing/tests/test_fixture.py	2011-07-05 16:44:58 +0000
@@ -5,6 +5,9 @@
 
 __metaclass__ = type
 
+from textwrap import dedent
+
+from fixtures import EnvironmentVariableFixture
 from zope.component import (
     adapts,
     queryAdapter,
@@ -16,7 +19,32 @@
 
 from canonical.testing.layers import BaseLayer
 from lp.testing import TestCase
-from lp.testing.fixture import ZopeAdapterFixture
+from lp.testing.fixture import (
+    RabbitServer,
+    ZopeAdapterFixture,
+    )
+
+
+class TestRabbitServer(TestCase):
+
+    layer = BaseLayer
+
+    def test_service_config(self):
+        # Rabbit needs to fully isolate itself: an existing per user
+        # .erlange.cookie has to be ignored, and ditto bogus HOME if other
+        # tests fail to cleanup.
+        self.useFixture(EnvironmentVariableFixture('HOME', '/nonsense/value'))
+
+        # RabbitServer pokes some .ini configuration into its config.
+        with RabbitServer() as fixture:
+            expected = dedent("""\
+                [rabbitmq]
+                host: localhost:%d
+                userid: guest
+                password: guest
+                virtual_host: /
+                """ % fixture.config.port)
+            self.assertEqual(expected, fixture.config.service_config)
 
 
 class IFoo(Interface):

=== modified file 'versions.cfg'
--- versions.cfg	2011-07-04 10:48:28 +0000
+++ versions.cfg	2011-07-05 16:44:58 +0000
@@ -65,7 +65,7 @@
 pytz = 2010o
 rdflib = 3.1.0
 RestrictedPython = 3.5.1
-rabbitfixture = 0.1
+rabbitfixture = 0.2.1
 roman = 1.4.0
 # See http://code.google.com/p/selenium/issues/detail?id=1935 .
 selenium = 2.0rc3-lp-distribute-fix