rabbitfixture

Merge lp:~cjwatson/rabbitfixture/py3-rabbitctl-timeout-cleanup into lp:rabbitfixture

  1. py3-rabbitctl-timeout-cleanup
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 51
Proposed branch: lp:~cjwatson/rabbitfixture/py3-rabbitctl-timeout-cleanup
Merge into: lp:rabbitfixture
Diff against target: 24 lines (+3/-0)
2 files modified
NEWS.rst (+2/-0)
rabbitfixture/server.py (+1/-0)
To merge this branch: bzr merge lp:~cjwatson/rabbitfixture/py3-rabbitctl-timeout-cleanup
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+397233@code.launchpad.net

Commit message

Fix ResourceWarning on Python 3 if rabbitctl times out.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.rst'
2--- NEWS.rst 2021-02-01 10:26:51 +0000
3+++ NEWS.rst 2021-02-01 10:45:17 +0000
4@@ -6,6 +6,8 @@
5 =====
6
7 - Add tox testing support and drop buildout.
8+- Fix ``ResourceWarning`` on Python 3 if
9+ ``RabbitServerEnvironment.rabbitctl`` times out.
10
11 0.4.2 (2019-08-23)
12 ==================
13
14=== modified file 'rabbitfixture/server.py'
15--- rabbitfixture/server.py 2019-08-21 13:55:49 +0000
16+++ rabbitfixture/server.py 2021-02-01 10:45:17 +0000
17@@ -232,6 +232,7 @@
18 outstr, errstr = ctl.communicate(timeout=timeout)
19 except subprocess.TimeoutExpired:
20 ctl.kill()
21+ ctl.communicate()
22 raise
23 if strip:
24 return outstr.strip(), errstr.strip()

Subscribers

People subscribed via source and target branches

to all changes: