Merge lp:~cjwatson/rabbitfixture/fix-test-stop-hang into lp:rabbitfixture

[Colin Watson]

Fix test_stop_hang failure introduced in 0.4.2.

In 0.4.2, I introduced a ctltimeout parameter to RabbitServerRunner to allow overriding the default server control timeout, and converted test_stop_hang to use it. However, changing that test was a mistake: it only wants to override ctltimeout while stopping the server, not while starting it, and overriding it while starting the server results in a high probability of timing out. Revert the test changes to get the test suite working again.

[Tom Wardill (twom)]

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2021-02-01 10:26:51 +0000
+++ NEWS.rst	2021-02-01 10:35:37 +0000
@@ -6,6 +6,7 @@
 =====
 
 - Add tox testing support and drop buildout.
+- Fix ``test_stop_hang`` failure introduced in 0.4.2.
 
 0.4.2 (2019-08-23)
 ==================
 
=== modified file 'rabbitfixture/tests/test_server.py'
--- rabbitfixture/tests/test_server.py	2019-08-21 13:55:49 +0000
+++ rabbitfixture/tests/test_server.py	2021-02-01 10:35:37 +0000
@@ -76,7 +76,7 @@
             f.write("while :; do sleep 1 || exit; done\n")
         os.chmod(fakectlbin, stat.S_IRWXU)
 
-        with RabbitServer(ctltimeout=0.1) as fixture:
+        with RabbitServer() as fixture:
             try:
                 connect_arguments = {
                     "host": 'localhost:%s' % fixture.config.port,
@@ -87,6 +87,9 @@
                 self.useFixture(MonkeyPatch(
                     "rabbitfixture.server.RabbitServerEnvironment.ctlbin",
                     fakectlbin))
+                self.useFixture(MonkeyPatch(
+                    "rabbitfixture.server.RabbitServerEnvironment.ctltimeout",
+                    0.1))
             except Exception:
                 # self.useFixture() is not being used because we want to
                 # handle the fixture's lifecycle, so we must also be