Skip to content

don't fail if collect already called #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2017
Merged

don't fail if collect already called #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion amqp/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,8 @@ def collect(self):
if self._transport:
self._transport.close()

temp_list = [x for x in values(self.channels) if x is not self]
temp_list = [x for x in values(self.channels or {})
if x is not self]
for ch in temp_list:
ch.collect()
except socket.error:
Expand Down
5 changes: 5 additions & 0 deletions t/unit/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ def test_collect_no_transport(self):
self.conn.collect()
assert not self.conn.connect.called

def test_collect_again(self):
self.conn = Connection()
self.conn.collect()
self.conn.collect()

def test_get_free_channel_id__raises_IndexError(self):
self.conn._avail_channel_ids = []
with pytest.raises(ResourceError):
Expand Down