Merge lp:~allenap/rabbitfixture/settable-resources into lp:rabbitfixture

[Gavin Panella]

Make RabbitServerResources configurable so that users have more control over the resources that the fixture makes use of.

In Launchpad, so that Rabbit can be brought up as a developer service like the librarian, we need to have some ability to configure what resources the fixture uses, like port.

[Gavin Panella (allenap)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-06-28 14:26:33 +0000
+++ .bzrignore	2011-07-05 20:14:42 +0000
@@ -1,5 +1,6 @@
 *.egg-info
 ./.installed.cfg
+./TAGS
 ./bin
 ./build
 ./develop-eggs
@@ -7,3 +8,4 @@
 ./download-cache/dist
 ./eggs
 ./parts
+./tags

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2011-07-05 13:45:06 +0000
+++ rabbitfixture/server.py	2011-07-05 20:14:42 +0000
@@ -7,6 +7,7 @@
 
 __all__ = [
     "RabbitServer",
+    "RabbitServerResources",
     ]
 
 import os
@@ -34,39 +35,6 @@
 RABBITBIN = "/usr/lib/rabbitmq/bin"
 
 
-# def setup_exchange(conf, port):
-#     """ create an exchange """
-#     # Not ported yet.
-#     conn = _get_connection(conf, port)
-#     # see if we already have the exchange
-#     must_create = False
-#     chan = conn.channel()
-#     try:
-#         chan.exchange_declare(exchange=conf.exchange_name + BRANCH_NICK,
-#                               type=conf.exchange_type, passive=True)
-#     except (amqp.AMQPConnectionException, amqp.AMQPChannelException), e:
-#         if e.amqp_reply_code == 404:
-#             must_create = True
-#             # amqplib kills the channel on error.... we dispose of it too
-#             chan.close()
-#             chan = conn.channel()
-#         else:
-#             raise
-#     # now create the exchange if needed
-#     if must_create:
-#         chan.exchange_declare(exchange=conf.exchange_name + BRANCH_NICK,
-#                               type=conf.exchange_type,
-#                               durable=True, auto_delete=False,)
-#         print "Created new exchange %s (%s)" % (
-#             conf.exchange_name + BRANCH_NICK, conf.exchange_type)
-#     else:
-#         print "Exchange %s (%s) is already declared" % (
-#             conf.exchange_name + BRANCH_NICK, conf.exchange_type)
-#     chan.close()
-#     conn.close()
-#     return True
-
-
 def preexec_fn():
     # Revert Python's handling of SIGPIPE. See
     # http://bugs.python.org/issue1652 for more info.
@@ -102,14 +70,30 @@
     :ivar nodename: The name of the node.
     """
 
+    def __init__(self, hostname=None, port=None, homedir=None,
+                 mnesiadir=None, logfile=None, nodename=None):
+        super(RabbitServerResources, self).__init__()
+        self.hostname = hostname
+        self.port = port
+        self.homedir = homedir
+        self.mnesiadir = mnesiadir
+        self.logfile = logfile
+        self.nodename = nodename
+
     def setUp(self):
         super(RabbitServerResources, self).setUp()
-        self.hostname = 'localhost'
-        self.port = allocate_ports()[0]
-        self.homedir = self.useFixture(TempDir()).path
-        self.mnesiadir = self.useFixture(TempDir()).path
-        self.logfile = os.path.join(self.homedir, 'server.log')
-        self.nodename = os.path.basename(self.useFixture(TempDir()).path)
+        if self.hostname is None:
+            self.hostname = 'localhost'
+        if self.port is None:
+            [self.port] = allocate_ports(1)
+        if self.homedir is None:
+            self.homedir = self.useFixture(TempDir()).path
+        if self.mnesiadir is None:
+            self.mnesiadir = self.useFixture(TempDir()).path
+        if self.logfile is None:
+            self.logfile = os.path.join(self.homedir, 'server.log')
+        if self.nodename is None:
+            self.nodename = os.path.basename(self.useFixture(TempDir()).path)
 
     @property
     def fq_nodename(self):
@@ -354,9 +338,14 @@
     :ivar runner: The `RabbitServerRunner` that bootstraps the server.
     """
 
+    def __init__(self, config=None):
+        super(RabbitServer, self).__init__()
+        self.config = config
+
     def setUp(self):
         super(RabbitServer, self).setUp()
-        self.config = RabbitServerResources()
+        if self.config is None:
+            self.config = RabbitServerResources()
         self.useFixture(self.config)
         self.runner = RabbitServerRunner(self.config)
         self.useFixture(self.runner)

=== modified file 'rabbitfixture/tests/test_server.py'
--- rabbitfixture/tests/test_server.py	2011-07-05 13:45:06 +0000
+++ rabbitfixture/tests/test_server.py	2011-07-05 20:14:42 +0000
@@ -6,21 +6,27 @@
 __metaclass__ = type
 
 import socket
+from socket import gethostname
 
 from amqplib import client_0_8 as amqp
 from fixtures import EnvironmentVariableFixture
-from rabbitfixture.server import RabbitServer
+from rabbitfixture.server import (
+    RabbitServer,
+    RabbitServerResources,
+    )
 from testtools import TestCase
 
 
 class TestRabbitFixture(TestCase):
 
-    def test_start_check_shutdown(self):
+    def setUp(self):
+        super(TestRabbitFixture, self).setUp()
         # Rabbit needs to fully isolate itself: an existing per user
-        # .erlange.cookie has to be ignored, and ditto bogus HOME if other
+        # .erlang.cookie has to be ignored, and ditto bogus HOME if other
         # tests fail to cleanup.
         self.useFixture(EnvironmentVariableFixture('HOME', '/nonsense/value'))
 
+    def test_start_check_shutdown(self):
         fixture = self.useFixture(RabbitServer())
 
         # We can connect.
@@ -39,3 +45,38 @@
 
         # The daemon should be closed now.
         self.assertRaises(socket.error, amqp.Connection, **connect_arguments)
+
+    def test_config(self):
+        # The configuration can be passed in.
+        config = RabbitServerResources()
+        fixture = self.useFixture(RabbitServer(config))
+        self.assertIs(config, fixture.config)
+        self.assertIs(config, fixture.runner.config)
+        self.assertIs(config, fixture.runner.environment.config)
+
+
+class TestRabbitServerResources(TestCase):
+
+    def test_defaults(self):
+        with RabbitServerResources() as resources:
+            self.assertEqual("localhost", resources.hostname)
+            self.assertIsInstance(resources.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))
+
+    def test_passed_to_init(self):
+        args = dict(
+            hostname="hostname", port=1234,
+            homedir="homedir", mnesiadir="mnesiadir",
+            logfile="logfile", nodename="nodename")
+        with RabbitServerResources(**args) as resources:
+            for key, value in args.iteritems():
+                self.assertEqual(value, getattr(resources, key))
+
+    def test_fq_nodename(self):
+        with RabbitServerResources(nodename="nibbles") as resources:
+            self.assertEqual(
+                "nibbles@%s" % gethostname(),
+                resources.fq_nodename)