Merge from trunk into branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-3799-acl@1294242 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 17 insertions, 5 deletions

diff --git a/python/qpid/testlib.py b/python/qpid/testlib.py
index 1da53b3378..d9feb6b484 100644
--- a/python/qpid/testlib.py
+++ b/python/qpid/testlib.py
@@ -29,6 +29,9 @@ from qpid.message import Message
 from qpid.harness import Skipped
 from qpid.exceptions import VersionError
 
+import qpid.messaging
+import qpidtoollibs.broker
+
 class TestBase(unittest.TestCase):
     """Base class for Qpid test cases.
 
@@ -193,6 +196,15 @@ class TestBase010(unittest.TestCase):
         self.qmf = qmf.console.Session(handler)
         self.qmf_broker = self.qmf.addBroker(str(self.broker))
 
+    def startBrokerAccess(self):
+        """
+        New-style management access to the broker.  Can be used in lieu of startQmf.
+        """
+        if 'broker_conn' not in self.__dict__:
+            self.broker_conn = qpid.messaging.Connection(str(self.broker))
+            self.broker_conn.open()
+            self.broker_access = qpidtoollibs.broker.BrokerAgent(self.broker_conn)
+
     def connect(self, host=None, port=None):
         url = self.broker
         if url.scheme == URL.AMQPS:
diff --git a/python/qpid/tests/messaging/endpoints.py b/python/qpid/tests/messaging/endpoints.py
index db5ec03df2..62deacd0bd 100644
--- a/python/qpid/tests/messaging/endpoints.py
+++ b/python/qpid/tests/messaging/endpoints.py
@@ -524,7 +524,7 @@ class SessionTests(Base):
     self.ssn.acknowledge(echos[0])
     self.ssn.acknowledge(echos[1], Disposition(REJECTED))
     self.ssn.acknowledge(echos[2],
-                         Disposition(REJECTED, code=3, text="test-reject"))
+                         Disposition(REJECTED, code=0, text="test-reject"))
     self.drain(rej, expected=msgs[1:])
     self.ssn.acknowledge()
 
@@ -632,9 +632,9 @@ class SessionTests(Base):
 
   def testDoubleCommit(self):
     ssn = self.conn.session(transactional=True)
-    snd = ssn.sender("amq.direct")
-    rcv = ssn.receiver("amq.direct")
-    msgs = [self.message("testDoubleCommit", i) for i in range(3)]
+    snd = ssn.sender("amq.direct/doubleCommit")
+    rcv = ssn.receiver("amq.direct/doubleCommit")
+    msgs = [self.message("testDoubleCommit", i, subject="doubleCommit") for i in range(3)]
     for m in msgs:
       snd.send(m)
     ssn.commit()
@@ -1038,7 +1038,7 @@ class AddressTests(Base):
       snd.close()
       assert False, "successfully deleted amq.topic"
     except SessionError, e:
-      assert "Cannot delete default exchange" in str(e)
+      assert e.code == 530
     # XXX: need to figure out close after error
     self.conn._remove_session(self.ssn)