You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2014/11/12 14:49:51 UTC
svn commit: r1638787 - in /qpid/dispatch/trunk: tests/system_tests_qdstat.py
tools/qdstat
Author: tross
Date: Wed Nov 12 13:49:51 2014
New Revision: 1638787
URL: http://svn.apache.org/r1638787
Log:
NO-JIRA - Mask type-annotation of entity names in qdstat, add test coverage
Modified:
qpid/dispatch/trunk/tests/system_tests_qdstat.py
qpid/dispatch/trunk/tools/qdstat
Modified: qpid/dispatch/trunk/tests/system_tests_qdstat.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_qdstat.py?rev=1638787&r1=1638786&r2=1638787&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_qdstat.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_qdstat.py Wed Nov 12 13:49:51 2014
@@ -63,7 +63,7 @@ class QdstatTest(system_test.TestCase):
self.run_qdstat(['--address'], r'\$management')
def test_memory(self):
- self.run_qdstat(['--memory'], r'qd_address_t\s+[0-9]+')
+ self.run_qdstat(['--memory'], r' qd_address_t\s+[0-9]+')
class OldQdstatTest(QdstatTest):
Modified: qpid/dispatch/trunk/tools/qdstat
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdstat?rev=1638787&r1=1638786&r2=1638787&view=diff
==============================================================================
--- qpid/dispatch/trunk/tools/qdstat (original)
+++ qpid/dispatch/trunk/tools/qdstat Wed Nov 12 13:49:51 2014
@@ -143,6 +143,14 @@ class BusManager(Node):
return addr[1]
return ''
+ def _name_clean(self, name):
+ if not name:
+ return "-"
+ pos = name.find(':')
+ if pos >= 0:
+ return name[pos + 1:]
+ return name
+
def displayGeneral(self):
disp = Display(prefix=" ")
heads = []
@@ -155,7 +163,7 @@ class BusManager(Node):
router = objects[0]
rows.append(('Mode', router.mode))
rows.append(('Area', router.area))
- rows.append(('Router Id', router.name))
+ rows.append(('Router Id', self._name_clean(router.name)))
rows.append(('Address Count', router.addrCount))
rows.append(('Link Count', router.linkCount))
rows.append(('Node Count', router.nodeCount))
@@ -184,7 +192,7 @@ class BusManager(Node):
row.append(link.linkType)
row.append(link.linkDir)
if link.linkType == "inter-router":
- row.append(link.name)
+ row.append(self._name_clean(link.name))
else:
row.append('-')
row.append(self._addr_class(link.owningAddr))
@@ -214,10 +222,10 @@ class BusManager(Node):
nodes = {}
for node in objects:
- nodes[node.name] = node
+ nodes[self._name_clean(node.name)] = node
node.addr = self._addr_text(node.addr)
- rows.append([attached.name, '-', '(self)', ''])
+ rows.append([self._name_clean(attached.name), '-', '(self)', ''])
for node in objects:
row = []
row.append(node.addr)
@@ -263,9 +271,9 @@ class BusManager(Node):
for addr in objects:
row = []
- row.append(self._addr_class(addr.name))
- row.append(self._addr_text(addr.name))
- row.append(self._addr_phase(addr.name))
+ row.append(self._addr_class(self._name_clean(addr.name)))
+ row.append(self._addr_text(self._name_clean(addr.name)))
+ row.append(self._addr_phase(self._name_clean(addr.name)))
row.append(addr.inProcess)
row.append(addr.subscriberCount)
row.append(addr.remoteCount)
@@ -297,7 +305,7 @@ class BusManager(Node):
for t in objects:
row = []
- row.append(t.name)
+ row.append(self._name_clean(t.name))
row.append(t.typeSize)
row.append(t.transferBatchSize)
row.append(t.localFreeListMax)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org