You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2014/10/20 17:34:36 UTC
svn commit: r1633173 - in /qpid/dispatch/trunk:
python/qpid_dispatch_internal/management/agent.py python/setup.py.in
tests/CMakeLists.txt tests/system_test.py tests/system_tests_management.py
tests/system_tests_qdstat.py
Author: aconway
Date: Mon Oct 20 15:34:36 2014
New Revision: 1633173
URL: http://svn.apache.org/r1633173
Log:
DISPATCH-56: Minor test fixes for python 2.6, install qdrouterd.json schema.
WIP: Fix python test runner for python 2.6
Modified:
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py
qpid/dispatch/trunk/python/setup.py.in
qpid/dispatch/trunk/tests/CMakeLists.txt
qpid/dispatch/trunk/tests/system_test.py
qpid/dispatch/trunk/tests/system_tests_management.py
qpid/dispatch/trunk/tests/system_tests_qdstat.py
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py?rev=1633173&r1=1633172&r2=1633173&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py Mon Oct 20 15:34:36 2014
@@ -195,12 +195,17 @@ class CEntity(Entity):
Entity that is registered from C code rather than created via management.
"""
def __init__(self, agent, entity_type, pointer):
+ def prefix(prefix, name):
+ if not str(name).startswith(prefix):
+ name = "%s:%s" % (prefix, name)
+ return name
+
super(CEntity, self).__init__(agent, entity_type, validate=False)
self._set_pointer(pointer)
self._update()
- if not 'identity' in self.attributes:
- self.attributes['identity'] = "%s:%s" % (entity_type.short_name, self.id_count.next())
- self.attributes['identity'] = str(self.attributes['identity'])
+ identity = self.attributes.get('identity')
+ if identity is None: identity = str(self.id_count.next())
+ self.attributes['identity'] = prefix(entity_type.short_name, identity)
self.validate()
Modified: qpid/dispatch/trunk/python/setup.py.in
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/setup.py.in?rev=1633173&r1=1633172&r2=1633173&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/setup.py.in (original)
+++ qpid/dispatch/trunk/python/setup.py.in Mon Oct 20 15:34:36 2014
@@ -44,6 +44,7 @@ setup(
description='Apache Qpid Dispatch tools and libraries.',
package_dir={'' : '${CMAKE_SOURCE_DIR}/python'},
packages=['qpid_dispatch', 'qpid_dispatch.management'],
+ package_data={'qpid_dispatch.management': ['*.json']},
scripts=['${CMAKE_SOURCE_DIR}/tools/qdstat', '${CMAKE_SOURCE_DIR}/tools/qdmanage'],
cmdclass={'build_py': BuildPy},
Modified: qpid/dispatch/trunk/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/CMakeLists.txt?rev=1633173&r1=1633172&r2=1633173&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/tests/CMakeLists.txt Mon Oct 20 15:34:36 2014
@@ -67,7 +67,7 @@ add_test(router_tests ${TEST_WR
add_test(management_tests ${TEST_WRAP} -m unittest -v management)
macro(add_system_test test)
- add_test(${test} ${TEST_WRAP} -m unittest -v ${test})
+ add_test(${test} ${TEST_WRAP} -m ${test} -v)
endmacro(add_system_test)
add_system_test(system_tests_broker)
Modified: qpid/dispatch/trunk/tests/system_test.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_test.py?rev=1633173&r1=1633172&r2=1633173&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_test.py (original)
+++ qpid/dispatch/trunk/tests/system_test.py Mon Oct 20 15:34:36 2014
@@ -363,7 +363,7 @@ class Qdrouterd(Process):
Otherwise return None"""
connections = self.management.query('org.apache.qpid.dispatch.connection').get_entities()
for c in connections:
- if c['name'] == '%s:%s'%(host, port):
+ if c['name'].endswith('%s:%s'%(host, port)):
return c
return None
@@ -618,3 +618,6 @@ class TestCase(unittest.TestCase, Tester
avg = sum(seq)/len(seq)
for i in seq:
assert i > avg/2, "Work not fairly distributed: %s"%seq
+
+ def assertIn(self, item, items):
+ assert item in items, "%s not in %s" % (item, items)
Modified: qpid/dispatch/trunk/tests/system_tests_management.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_management.py?rev=1633173&r1=1633172&r2=1633173&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_management.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_management.py Mon Oct 20 15:34:36 2014
@@ -303,8 +303,6 @@ class ManagementTest(system_test.TestCas
self.assertEqual([u'amqp:/_topo/0/router2/$management', u'amqp:/_topo/0/router1/$management'],
sum([n.get_mgmt_nodes() for n in nodes], []))
-
-
def test_get_types(self):
types = self.node.get_types()
self.assertIn('org.apache.qpid.dispatch.listener', types)
@@ -321,7 +319,8 @@ class ManagementTest(system_test.TestCas
def test_get_attributes(self):
result = self.node.get_attributes(type=DUMMY)
- self.assertEqual({DUMMY: [u'arg1', u'arg2', u'num1', u'num2', u'name', u'identity', u'type']}, result)
+ self.assertEqual(set([u'arg1', u'arg2', u'num1', u'num2', u'name', u'identity', u'type']),
+ set(result[DUMMY]))
result = self.node.get_attributes()
for type in LISTENER, WAYPOINT, LINK: self.assertIn(type, result)
for a in ['linkType', 'linkDir', 'owningAddr']: self.assertIn(a, result[LINK])
Modified: qpid/dispatch/trunk/tests/system_tests_qdstat.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_qdstat.py?rev=1633173&r1=1633172&r2=1633173&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_qdstat.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_qdstat.py Mon Oct 20 15:34:36 2014
@@ -57,7 +57,7 @@ class QdstatTest(system_test.TestCase):
self.run_qdstat(['--nodes'], r'router-id\s+next-hop\s+link')
def test_address(self):
- self.run_qdstat(['--address'], r'local.*\$management')
+ self.run_qdstat(['--address'], r'\$management')
def test_memory(self):
self.run_qdstat(['--memory'], r'qd_address_t\s+[0-9]+')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org