Merge lp:~allenap/rabbitfixture/remove-service-config-bug-803043 into lp:rabbitfixture

[Gavin Panella]

Remove service_config and bump the version to 0.2.

Removes service_config and bumps the version to 0.2.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2011-06-30 11:50:40 +0000
+++ rabbitfixture/server.py	2011-07-05 13:49:38 +0000
@@ -14,7 +14,6 @@
 import signal
 import socket
 import subprocess
-from textwrap import dedent
 import time
 
 from amqplib import client_0_8 as amqp
@@ -111,16 +110,6 @@
         self.mnesiadir = self.useFixture(TempDir()).path
         self.logfile = os.path.join(self.homedir, 'server.log')
         self.nodename = os.path.basename(self.useFixture(TempDir()).path)
-        # XXX: GavinPanella 2011-06-28 bug=???: There is a (launchpad
-        # specific) config fixture. This should be a separate class in the
-        # Launchpad tree.
-        self.service_config = dedent("""\
-            [rabbitmq]
-            host: localhost:%d
-            userid: guest
-            password: guest
-            virtual_host: /
-            """ % self.port)
 
     @property
     def fq_nodename(self):

=== modified file 'rabbitfixture/tests/test_server.py'
--- rabbitfixture/tests/test_server.py	2011-06-28 14:23:36 +0000
+++ rabbitfixture/tests/test_server.py	2011-07-05 13:49:38 +0000
@@ -6,7 +6,6 @@
 __metaclass__ = type
 
 import socket
-from textwrap import dedent
 
 from amqplib import client_0_8 as amqp
 from fixtures import EnvironmentVariableFixture
@@ -36,18 +35,6 @@
         # Which shouldn't blow up on iteration.
         list(log.iter_text())
 
-        # XXX: GavinPanella 2011-06-28 bug=???: There is a (launchpad
-        # specific) config fixture. This should be a separate class in the
-        # Launchpad tree.
-        expected = dedent("""\
-            [rabbitmq]
-            host: localhost:%d
-            userid: guest
-            password: guest
-            virtual_host: /
-            """ % fixture.config.port)
-        self.assertEqual(expected, fixture.config.service_config)
-
         fixture.cleanUp()
 
         # The daemon should be closed now.

=== modified file 'setup.py'
--- setup.py	2011-06-30 13:28:10 +0000
+++ setup.py	2011-07-05 13:49:38 +0000
@@ -6,7 +6,7 @@
 
 setup(
     name='rabbitfixture',
-    version="0.1",
+    version="0.2",
     packages=find_packages('.'),
     package_dir={'': '.'},
     include_package_data=True,