Author: tross
Date: Thu Mar 22 20:09:13 2012
New Revision: 1304023
URL: http://svn.apache.org/viewvc?rev=1304023&view=rev
Log:
QPID-3907 - Merged fix into 0.16
Modified:
qpid/branches/0.16/qpid/cpp/src/tests/cli_tests.py
qpid/branches/0.16/qpid/tools/src/py/qpid-config
Modified: qpid/branches/0.16/qpid/cpp/src/tests/cli_tests.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/src/tests/cli_tests.py?rev=1304023&r1=1304022&r2=1304023&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/cpp/src/tests/cli_tests.py (original)
+++ qpid/branches/0.16/qpid/cpp/src/tests/cli_tests.py Thu Mar 22 20:09:13 2012
@@ -330,6 +330,9 @@ class CliTests(TestBase010):
ret = os.system(self.qpid_config_command(" add queue %s
--alternate-exchange=%s" % (qName, altName)))
self.assertEqual(ret, 0)
+ ret = os.system(self.qpid_config_command(" queues"))
+ self.assertEqual(ret, 0)
+
queues = self.broker_access.getAllQueues()
found = False
for queue in queues:
Modified: qpid/branches/0.16/qpid/tools/src/py/qpid-config
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/tools/src/py/qpid-config?rev=1304023&r1=1304022&r2=1304023&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/tools/src/py/qpid-config (original)
+++ qpid/branches/0.16/qpid/tools/src/py/qpid-config Thu Mar 22 20:09:13 2012
@@ -481,7 +481,7 @@ class BrokerManager:
if LVQ_KEY in args: print "--lvq-key=%s" % args[LVQ_KEY],
if QUEUE_EVENT_GENERATION in args: print
"--generate-queue-events=%s" % args[QUEUE_EVENT_GENERATION],
if q.altExchange:
- print "--alternate-exchange=%s" % q._altExchange_.name,
+ print "--alternate-exchange=%s" % q.altExchange,
if FLOW_STOP_SIZE in args: print "--flow-stop-size=%s" %
args[FLOW_STOP_SIZE],
if FLOW_RESUME_SIZE in args: print "--flow-resume-size=%s" %
args[FLOW_RESUME_SIZE],
if FLOW_STOP_COUNT in args: print "--flow-stop-count=%s" %
args[FLOW_STOP_COUNT],
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
