diff options
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/tests_0-10/alternate-exchange.py | 8 | ||||
| -rw-r--r-- | qpid/python/tests_0-10/dtx.py | 10 | ||||
| -rw-r--r-- | qpid/python/tests_0-10/message.py | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/qpid/python/tests_0-10/alternate-exchange.py b/qpid/python/tests_0-10/alternate-exchange.py index a749d733b0..a857496a48 100644 --- a/qpid/python/tests_0-10/alternate-exchange.py +++ b/qpid/python/tests_0-10/alternate-exchange.py @@ -136,9 +136,9 @@ class AlternateExchangeTests(TestBase): #cleanup: other = self.connect() channel = other.channel(1) - channel.channel_open() + channel.session_open() channel.exchange_delete(exchange="alternate") - channel.channel_close(200, "ok") + channel.session_close() other.close() self.assertConnectionException(530, e.args[0]) @@ -162,10 +162,10 @@ class AlternateExchangeTests(TestBase): #cleanup: other = self.connect() channel = other.channel(1) - channel.channel_open() + channel.session_open() channel.exchange_delete(exchange="e") channel.exchange_delete(exchange="alternate") - channel.channel_close(200, "ok") + channel.session_close() other.close() self.assertConnectionException(530, e.args[0]) diff --git a/qpid/python/tests_0-10/dtx.py b/qpid/python/tests_0-10/dtx.py index 000eddff21..ce6e467e0a 100644 --- a/qpid/python/tests_0-10/dtx.py +++ b/qpid/python/tests_0-10/dtx.py @@ -461,8 +461,11 @@ class DtxTests(TestBase): channel2.dtx_demarcation_select() channel2.dtx_demarcation_start(xid=tx) - channel2.message_get(queue="dummy", destination="dummy") + channel2.message_subscribe(queue="dummy", destination="dummy", confirm_mode=1) + channel2.message_flow(destination="dummy", unit=0, value=1) + channel2.message_flow(destination="dummy", unit=1, value=0xFFFFFFFF) self.client.queue("dummy").get(timeout=1).complete() + channel2.message_cancel(destination="dummy") channel2.message_transfer(content=Content(properties={'routing_key':"dummy"}, body="whatever")) channel2.session_close() @@ -589,8 +592,11 @@ class DtxTests(TestBase): def swap(self, channel, src, dest): #consume from src: - channel.message_get(destination="temp-swap", queue=src) + channel.message_subscribe(destination="temp-swap", queue=src, confirm_mode=1) + channel.message_flow(destination="temp-swap", unit=0, value=1) + channel.message_flow(destination="temp-swap", unit=1, value=0xFFFFFFFF) msg = self.client.queue("temp-swap").get(timeout=1) + channel.message_cancel(destination="temp-swap") msg.complete(); #re-publish to dest diff --git a/qpid/python/tests_0-10/message.py b/qpid/python/tests_0-10/message.py index ba26dda309..b5b058340f 100644 --- a/qpid/python/tests_0-10/message.py +++ b/qpid/python/tests_0-10/message.py @@ -70,7 +70,7 @@ class MessageTests(TestBase): #open new channel and cleanup last consumer: channel = self.client.channel(2) - channel.channel_open() + channel.session_open() #check that an exclusive consumer cannot be created if a consumer already exists: self.subscribe(channel, destination="first", queue="test-queue-2") @@ -93,7 +93,7 @@ class MessageTests(TestBase): self.assertChannelException(404, e.args[0]) channel = self.client.channel(2) - channel.channel_open() + channel.session_open() try: #queue not specified and none previously declared for channel: self.subscribe(channel, queue="", destination="") |