Author: tross
Date: Fri Jul 18 19:44:06 2014
New Revision: 1611782
URL: http://svn.apache.org/r1611782
Log:
NO-JIRA - Removed usage of 'assertIn' which in unavailable prior to Python 2.7.
Modified:
qpid/dispatch/trunk/tests/system_tests_management.py
Modified: qpid/dispatch/trunk/tests/system_tests_management.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_management.py?rev=1611782&r1=1611781&r2=1611782&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_management.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_management.py Fri Jul 18 19:44:06
2014
@@ -87,7 +87,7 @@ class ManagementTest(system_test.TestCas
"""Query with type only"""
response = self.node2.query(type=LISTENER)
for attr in ['type', 'name', 'identity', 'addr', 'port']:
- self.assertIn(attr, response.attribute_names)
+ self.assertTrue(attr in response.attribute_names)
for r in response.result_maps: # Check types
self.assertEqual(len(response.attribute_names), len(r))
self.assertEqual(r['type'], LISTENER)
@@ -101,8 +101,8 @@ class ManagementTest(system_test.TestCas
self.assertEqual(attribute_names, response.attribute_names)
expect = [[LISTENER, 'l%s' % i, str(self.router.ports[i])] for i in
xrange(3)]
for r in expect: # We might have extras in results due to create tests
- self.assertIn(r, response.results)
- self.assertIn(dict(zip(attribute_names, r)), response.result_maps)
+ self.assertTrue(r in response.results)
+ self.assertTrue(dict(zip(attribute_names, r)) in
response.result_maps)
def test_query_attributes(self):
"""Query with attributes only"""
@@ -111,7 +111,7 @@ class ManagementTest(system_test.TestCas
self.assertEqual(attribute_names, response.attribute_names)
expect = [[LISTENER, 'l%s' % i, str(self.router.ports[i])] for i in
xrange(3)]
for r in expect: # We might have extras in results due to create tests
- self.assertIn(r, response.results)
+ self.assertTrue(r in response.results)
for name in ['router0', 'log0']:
self.assertTrue([r for r in response.result_maps if r['name'] ==
name],
msg="Can't find result with name '%s'" % name)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
