Use octet each for class and method id (changed c++ and python)

Modified indexes in xml for message.empty, message.offset and the c++ cluster class

Fixed encoding for rfc1982-long-set in c++ and python (its a size not a count that is prepended)

Fixed minor typo in configuration option help string

Use session.open/close in python tests, handle session.closed

Commented out the response tag in session.close due to pythons ambiguity as to whether session.closed is a response or not

Disabled broker.test_closed_channel (due to above issue); broker behaves as expected but test fails; test_invalid_channel is safe enough for now.
  


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@578053 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 10 deletions

diff --git a/python/tests_0-10/queue.py b/python/tests_0-10/queue.py
index e3438116c8..ba017bb286 100644
--- a/python/tests_0-10/queue.py
+++ b/python/tests_0-10/queue.py
@@ -56,7 +56,7 @@ class QueueTests(TestBase):
 
         #check error conditions (use new channels): 
         channel = self.client.channel(2)
-        channel.channel_open()
+        channel.session_open()
         try:
             #queue specified but doesn't exist:
             channel.queue_purge(queue="invalid-queue")
@@ -65,7 +65,7 @@ class QueueTests(TestBase):
             self.assertChannelException(404, e.args[0])
 
         channel = self.client.channel(3)
-        channel.channel_open()
+        channel.session_open()
         try:
             #queue not specified and none previously declared for channel:
             channel.queue_purge()
@@ -76,7 +76,7 @@ class QueueTests(TestBase):
         #cleanup    
         other = self.connect()
         channel = other.channel(1)
-        channel.channel_open()
+        channel.session_open()
         channel.exchange_delete(exchange="test-exchange")
 
     def test_declare_exclusive(self):
@@ -88,7 +88,7 @@ class QueueTests(TestBase):
         # Here we open a second separate connection:
         other = self.connect()
         c2 = other.channel(1)
-        c2.channel_open()
+        c2.session_open()
 
         #declare an exclusive queue:
         c1.queue_declare(queue="exclusive-queue", exclusive="True")
@@ -141,7 +141,7 @@ class QueueTests(TestBase):
 
         #need to reopen a channel:    
         channel = self.client.channel(2)
-        channel.channel_open()
+        channel.session_open()
 
         #try and bind non-existant queue:
         try:
@@ -225,7 +225,7 @@ class QueueTests(TestBase):
 
         #check attempted deletion of non-existant queue is handled correctly:    
         channel = self.client.channel(2)
-        channel.channel_open()
+        channel.session_open()
         try:
             channel.queue_delete(queue="i-dont-exist", if_empty="True")
             self.fail("Expected delete of non-existant queue to fail")
@@ -254,7 +254,7 @@ class QueueTests(TestBase):
 
         #need new channel now:    
         channel = self.client.channel(2)
-        channel.channel_open()
+        channel.session_open()
 
         #empty queue:
         self.subscribe(channel, destination="consumer_tag", queue="delete-me-2")
@@ -286,7 +286,7 @@ class QueueTests(TestBase):
 
         #need new channel now:    
         channel2 = self.client.channel(2)
-        channel2.channel_open()
+        channel2.session_open()
         #try to delete, but only if empty:
         try:
             channel2.queue_delete(queue="delete-me-3", if_unused="True")
@@ -312,7 +312,7 @@ class QueueTests(TestBase):
         channel = self.channel
         other = self.connect()
         channel2 = other.channel(1)
-        channel2.channel_open()
+        channel2.session_open()
 
         channel.queue_declare(queue="auto-delete-me", auto_delete=True)
 
@@ -321,7 +321,7 @@ class QueueTests(TestBase):
         channel2.basic_consume(queue="auto-delete-me")
 
         #implicit cancel
-        channel2.channel_close()
+        channel2.session_close()
 
         #check it is still there
         channel.queue_declare(queue="auto-delete-me", passive=True)