diff options
| author | Gordon Sim <gsim@apache.org> | 2007-01-18 08:14:36 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-01-18 08:14:36 +0000 |
| commit | f1e00165dd741c383bca69c448898bab4a7ce814 (patch) | |
| tree | 7286acf90c748609ca4744ca394f9ac789b96ae8 /python | |
| parent | d81e5cad26f060b64501448d97ae5b6c821dce08 (diff) | |
| download | qpid-python-f1e00165dd741c383bca69c448898bab4a7ce814.tar.gz | |
Modified handling of reason for closing in peer to work around race between worker and reader where a connection.close is followed by the socket closing (this is a bit of a hack).
Modified test for queue_purge to do cleanup on new connection.
Separated testing of scenario where closed channel is used from that where an unopened channel is used.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@497342 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
| -rw-r--r-- | python/java_failing.txt | 1 | ||||
| -rw-r--r-- | python/qpid/peer.py | 2 | ||||
| -rw-r--r-- | python/tests/broker.py | 4 | ||||
| -rw-r--r-- | python/tests/queue.py | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/python/java_failing.txt b/python/java_failing.txt index a564fe0148..b6cfdc600e 100644 --- a/python/java_failing.txt +++ b/python/java_failing.txt @@ -13,3 +13,4 @@ tests.queue.QueueTests.test_declare_exclusive tests.queue.QueueTests.test_purge tests.testlib.TestBaseTest.testMessageProperties tests.broker.BrokerTests.test_invalid_channel +tests.broker.BrokerTests.test_closed_channel diff --git a/python/qpid/peer.py b/python/qpid/peer.py index acffeb2537..a265e45f43 100644 --- a/python/qpid/peer.py +++ b/python/qpid/peer.py @@ -129,6 +129,8 @@ class Channel: self.reason = None def close(self, reason): + if isinstance(reason, Message): + self.reason = reason if self.closed: return self.closed = True diff --git a/python/tests/broker.py b/python/tests/broker.py index f3888589a5..d9ac69c5e3 100644 --- a/python/tests/broker.py +++ b/python/tests/broker.py @@ -85,14 +85,14 @@ class BrokerTests(TestBase): self.assert_(msg.content.body == body) def test_invalid_channel(self): - other = self.connect() - channel = other.channel(200) + channel = self.client.channel(200) try: channel.queue_declare(exclusive=True) self.fail("Expected error on queue_declare for invalid channel") except Closed, e: self.assertConnectionException(504, e.args[0]) + def test_closed_channel(self): channel = self.client.channel(200) channel.channel_open() channel.channel_close() diff --git a/python/tests/queue.py b/python/tests/queue.py index d5c13fa87a..9e32c44fd5 100644 --- a/python/tests/queue.py +++ b/python/tests/queue.py @@ -74,7 +74,8 @@ class QueueTests(TestBase): self.assertConnectionException(530, e.args[0]) #cleanup - channel = self.client.channel(4) + other = self.connect() + channel = other.channel(1) channel.channel_open() channel.exchange_delete(exchange="test-exchange") |