You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2020/11/12 21:26:22 UTC
[qpid-dispatch] branch DISPATCH-1834 created (now adc1b6b)
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a change to branch DISPATCH-1834
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git.
at adc1b6b DISPATCH-1834: Fixed python-checker errors. Used assertIn and assertNotIn
This branch includes the following new commits:
new adc1b6b DISPATCH-1834: Fixed python-checker errors. Used assertIn and assertNotIn
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-dispatch] 01/01: DISPATCH-1834: Fixed python-checker errors.
Used assertIn and assertNotIn
Posted by gm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch DISPATCH-1834
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit adc1b6bfd38c6644a5e594c7c2fc255286e2af00
Author: Ganesh Murthy <gm...@apache.org>
AuthorDate: Thu Nov 12 16:25:10 2020 -0500
DISPATCH-1834: Fixed python-checker errors. Used assertIn and assertNotIn
---
tests/router_policy_test.py | 12 ++--
tests/system_tests_address_lookup.py | 6 +-
tests/system_tests_default_distribution.py | 12 ++--
tests/system_tests_edge_router.py | 38 ++++++------
tests/system_tests_exchange_bindings.py | 2 +-
tests/system_tests_link_routes.py | 18 +++---
tests/system_tests_management.py | 8 +--
tests/system_tests_multi_tenancy.py | 3 +-
tests/system_tests_open_properties.py | 2 +-
tests/system_tests_policy.py | 4 +-
tests/system_tests_protocol_settings.py | 40 ++++++-------
tests/system_tests_qdmanage.py | 4 +-
tests/system_tests_qdstat.py | 96 +++++++++++++++---------------
tests/system_tests_router_mesh.py | 2 +-
tests/system_tests_sasl_plain.py | 4 +-
tests/system_tests_ssl.py | 3 +-
tests/system_tests_two_routers.py | 4 +-
17 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/tests/router_policy_test.py b/tests/router_policy_test.py
index f39db54..459150c 100644
--- a/tests/router_policy_test.py
+++ b/tests/router_policy_test.py
@@ -254,7 +254,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:10000', 'chuck', '10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
- self.assertTrue('application connection limit' in diags[0])
+ self.assertIn('application connection limit', diags[0])
def test_policy_app_conn_mgr_fail_by_user(self):
stats = PolicyAppConnectionMgr(3, 1, 2)
@@ -262,7 +262,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:10000', 'chuck', '10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
- self.assertTrue('per user' in diags[0])
+ self.assertIn('per user', diags[0])
diags = []
self.assertTrue(stats.can_connect('10.10.10.10:10002', 'chuck', '10.10.10.10', diags, 2, None))
self.assertFalse(stats.can_connect('10.10.10.10:10003', 'chuck', '10.10.10.10', diags, 2, None))
@@ -273,7 +273,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:10000', 'chuck', '10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
- self.assertTrue('per host' in diags[0])
+ self.assertIn('per host', diags[0])
diags = []
self.assertTrue(stats.can_connect('10.10.10.10:10002', 'chuck', '10.10.10.10', diags, None, 2))
self.assertFalse(stats.can_connect('10.10.10.10:10003', 'chuck', '10.10.10.10', diags, None, 2))
@@ -284,7 +284,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:10000', 'chuck', '10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 2)
- self.assertTrue('per user' in diags[0] or 'per user' in diags[1])
+ self.assertIn('per user', diags[0] or 'per user' in diags[1])
self.assertTrue('per host' in diags[0] or 'per host' in diags[1])
diags = []
self.assertTrue(stats.can_connect('10.10.10.10:10002', 'chuck', '10.10.10.10', diags, 2, 2))
@@ -296,7 +296,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:10000', 'chuck', '10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
- self.assertTrue('per user' in diags[0])
+ self.assertIn('per user', diags[0])
diags = []
stats.update(3, 2, 2)
self.assertTrue(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
@@ -307,7 +307,7 @@ class PolicyAppConnectionMgrTests(TestCase):
self.assertTrue(stats.can_connect('10.10.10.10:10000', 'chuck', '10.10.10.10', diags, None, None))
self.assertFalse(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
self.assertTrue(len(diags) == 1)
- self.assertTrue('per user' in diags[0])
+ self.assertIn('per user', diags[0])
diags = []
stats.disconnect("10.10.10.10:10000", 'chuck', '10.10.10.10')
self.assertTrue(stats.can_connect('10.10.10.10:10001', 'chuck', '10.10.10.10', diags, None, None))
diff --git a/tests/system_tests_address_lookup.py b/tests/system_tests_address_lookup.py
index c9c719c..01a7745 100644
--- a/tests/system_tests_address_lookup.py
+++ b/tests/system_tests_address_lookup.py
@@ -49,10 +49,12 @@ class LinkRouteLookupTest(TestCase):
QCM_ADDR_LOOKUP_NOT_FOUND = 3
def _check_response(self, message):
- self.assertTrue(isinstance(message.properties, dict))
+ is_instance_dict = isinstance(message.properties, dict)
+ self.assertTrue(is_instance_dict)
self.assertEqual(self.PROTOCOL_VERSION, message.properties.get('version'))
self.assertTrue(message.properties.get('opcode') is not None)
- self.assertTrue(isinstance(message.body, list))
+ is_instance_list = isinstance(message.body, list)
+ self.assertTrue(is_instance_list)
self.assertEqual(2, len(message.body))
return (message.properties.get('status'),
message.body[0], # is link_route?
diff --git a/tests/system_tests_default_distribution.py b/tests/system_tests_default_distribution.py
index a09b507..79fd90e 100644
--- a/tests/system_tests_default_distribution.py
+++ b/tests/system_tests_default_distribution.py
@@ -78,12 +78,12 @@ class DefaultDistributionTest(TestCase):
def test_general(self):
out = self.run_qdstat(['--general'], r'(?s)Router Statistics.*Mode\s*Standalone')
- self.assertTrue("Connections 1" in out)
- self.assertTrue("Nodes 0" in out)
- self.assertTrue("Auto Links 0" in out)
- self.assertTrue("Link Routes 0" in out)
- self.assertTrue("Router Id QDR" in out)
- self.assertTrue("Mode standalone" in out)
+ self.assertIn("Connections 1", out)
+ self.assertIn("Nodes 0", out)
+ self.assertIn("Auto Links 0", out)
+ self.assertIn("Link Routes 0", out)
+ self.assertIn("Router Id QDR", out)
+ self.assertIn("Mode standalone", out)
class UnavailableBase(MessagingHandler):
diff --git a/tests/system_tests_edge_router.py b/tests/system_tests_edge_router.py
index 6b2595d..1bc6e6d 100644
--- a/tests/system_tests_edge_router.py
+++ b/tests/system_tests_edge_router.py
@@ -1247,42 +1247,42 @@ class RouterTest(TestCase):
# summary statostics of the edge router. It will not show statistics of the interior routers.
outs = self.run_qdstat(['--all-routers'],
address=self.routers[2].addresses[0])
- self.assertTrue("Router Id EA1" in outs)
+ self.assertIn("Router Id EA1", outs)
outs = self.run_qdstat(['--all-routers', '--all-entities'],
address=self.routers[2].addresses[0])
# Check if each entity section is showing
- self.assertTrue("Router Links" in outs)
- self.assertTrue("Router Addresses" in outs)
- self.assertTrue("Connections" in outs)
- self.assertTrue("AutoLinks" in outs)
- self.assertTrue("Auto Links" in outs)
+ self.assertIn("Router Links", outs)
+ self.assertIn("Router Addresses", outs)
+ self.assertIn("Connections", outs)
+ self.assertIn("AutoLinks", outs)
self.assertEqual(outs.count("Link Routes"), 2)
- self.assertTrue("Router Statistics" in outs)
- self.assertTrue("Router Id EA1" in outs)
+ self.assertIn("Auto Links", outs)
+ self.assertIn("Router Statistics", outs)
+ self.assertIn("Router Id EA1", outs)
- self.assertTrue("Memory Pools" in outs)
+ self.assertIn("Memory Pools", outs)
outs = self.run_qdstat(['-c', '--all-routers'],
address=self.routers[2].addresses[0])
# Verify that the the edhe uplink connection is showing
- self.assertTrue("INT.A" in outs)
- self.assertTrue("inter-router" not in outs)
+ self.assertIn("INT.A", outs)
+ self.assertNotIn("inter-router", outs)
outs = self.run_qdstat(['--all-entities'],
address=self.routers[2].addresses[0])
# Check if each entity section is showing
- self.assertTrue("Router Links" in outs)
- self.assertTrue("Router Addresses" in outs)
- self.assertTrue("Connections" in outs)
- self.assertTrue("AutoLinks" in outs)
- self.assertTrue("Auto Links" in outs)
+ self.assertIn("Router Links", outs)
+ self.assertIn("Router Addresses", outs)
+ self.assertIn("Connections", outs)
+ self.assertIn("AutoLinks", outs)
+ self.assertIn("Auto Links", outs)
self.assertEqual(outs.count("Link Routes"), 2)
- self.assertTrue("Router Statistics" in outs)
- self.assertTrue("Router Id EA1" in outs)
+ self.assertIn("Router Statistics", outs)
+ self.assertIn("Router Id EA1", outs)
- self.assertTrue("Memory Pools" in outs)
+ self.assertIn("Memory Pools", outs)
def test_69_interior_qdstat_all_routers(self):
# Connects to an interior router and runs "qdstat --all-routers"
diff --git a/tests/system_tests_exchange_bindings.py b/tests/system_tests_exchange_bindings.py
index 90d3c12..4acba3e 100644
--- a/tests/system_tests_exchange_bindings.py
+++ b/tests/system_tests_exchange_bindings.py
@@ -68,7 +68,7 @@ class ExchangeBindingsTest(TestCase):
for entity in entities:
if "name" in entity and entity["name"] == name:
for k,v in expected.items():
- self.assertTrue(k in entity)
+ self.assertIn(k, entity)
self.assertEqual(v, entity[k])
return
raise Exception("Could not find %s named %s" % (kind, name))
diff --git a/tests/system_tests_link_routes.py b/tests/system_tests_link_routes.py
index e6f351c..f06f946 100644
--- a/tests/system_tests_link_routes.py
+++ b/tests/system_tests_link_routes.py
@@ -207,23 +207,23 @@ class LinkRouteTest(TestCase):
out = self.run_qdmanage(cmd=cmd, address=self.routers[1].addresses[0])
# Make sure there is a dir of in and out.
- self.assertTrue('"direction": "in"' in out)
- self.assertTrue('"direction": "out"' in out)
- self.assertTrue('"containerId": "QDR.A"' in out)
+ self.assertIn('"direction": "in"', out)
+ self.assertIn('"direction": "out"', out)
+ self.assertIn('"containerId": "QDR.A"', out)
# Use the long type and make sure that qdmanage does not mess up the long type
cmd = 'QUERY --type=org.apache.qpid.dispatch.router.config.linkRoute'
out = self.run_qdmanage(cmd=cmd, address=self.routers[1].addresses[0])
# Make sure there is a dir of in and out.
- self.assertTrue('"direction": "in"' in out)
- self.assertTrue('"direction": "out"' in out)
- self.assertTrue('"containerId": "QDR.A"' in out)
+ self.assertIn('"direction": "in"', out)
+ self.assertIn('"direction": "out"', out)
+ self.assertIn('"containerId": "QDR.A"', out)
identity = out[out.find("identity") + 12: out.find("identity") + 13]
cmd = 'READ --type=linkRoute --identity=' + identity
out = self.run_qdmanage(cmd=cmd, address=self.routers[1].addresses[0])
- self.assertTrue(identity in out)
+ self.assertIn(identity, out)
exception_occurred = False
try:
@@ -253,7 +253,7 @@ class LinkRouteTest(TestCase):
identity = out[out.find("identity") + 12: out.find("identity") + 14]
cmd = 'READ --type=autoLink --identity=' + identity
out = self.run_qdmanage(cmd=cmd, address=self.routers[1].addresses[0])
- self.assertTrue(identity in out)
+ self.assertIn(identity, out)
def test_bbb_qdstat_link_routes_routerB(self):
"""
@@ -263,7 +263,7 @@ class LinkRouteTest(TestCase):
"""
out = self.run_qdstat_linkRoute(self.routers[1].addresses[0])
for route in ['a.*.toA.#', 'a.*.toD.#', 'org.apache', 'pulp.task']:
- self.assertTrue(route in out)
+ self.assertIn(route, out)
out_list = out.split()
self.assertEqual(out_list.count('in'), 4)
diff --git a/tests/system_tests_management.py b/tests/system_tests_management.py
index 4e9a996..c3cd41b 100644
--- a/tests/system_tests_management.py
+++ b/tests/system_tests_management.py
@@ -132,14 +132,14 @@ class ManagementTest(system_test.TestCase):
"""Query with type only"""
response = self.node.query(type=ROUTER)
for attr in ['type', 'metadata']:
- self.assertTrue(attr in response.attribute_names)
+ self.assertIn(attr, response.attribute_names)
self.assertEqual(response.get_entities()[0]['metadata'], 'selftest;solo')
def test_query_type(self):
"""Query with type only"""
response = self.node.query(type=LISTENER)
for attr in ['type', 'name', 'identity', 'host', 'port']:
- self.assertTrue(attr in response.attribute_names)
+ self.assertIn(attr, response.attribute_names)
for r in response.get_dicts():
self.assertEqual(len(response.attribute_names), len(r))
self.assertEqual(r['type'], LISTENER)
@@ -153,7 +153,7 @@ class ManagementTest(system_test.TestCase):
self.assertEqual(attribute_names, response.attribute_names)
expect = [[LISTENER, 'l%s' % i, str(self.router.ports[i])] for i in range(3)]
for r in expect: # We might have extras in results due to create tests
- self.assertTrue(r in response.results)
+ self.assertIn(r, response.results)
self.assertTrue(dict(zip(attribute_names, r)) in response.get_dicts())
def test_query_attributes(self):
@@ -163,7 +163,7 @@ class ManagementTest(system_test.TestCase):
self.assertEqual(attribute_names, response.attribute_names)
expect = [[LISTENER, 'l%s' % i, str(self.router.ports[i])] for i in range(3)]
for r in expect: # We might have extras in results due to create tests
- self.assertTrue(r in response.results)
+ self.assertIn(r, response.results)
for name in ['router/' + self.router.name, 'log/DEFAULT']:
self.assertTrue([r for r in response.get_dicts() if r['name'] == name],
msg="Can't find result with name '%s'" % name)
diff --git a/tests/system_tests_multi_tenancy.py b/tests/system_tests_multi_tenancy.py
index 7612aa9..c62d7b4 100644
--- a/tests/system_tests_multi_tenancy.py
+++ b/tests/system_tests_multi_tenancy.py
@@ -878,7 +878,8 @@ class WaypointTest(MessagingHandler):
self.second_conn.close()
self.first_conn.close()
self.timer.cancel()
- self.outs = "n_sent=%d n_rcvd=%d n_thru=%d n_waypoint_rcvd=%d" % (self.n_sent, self.n_rcvd, self.n_thru, self.n_waypoint_rcvd)
+ if self.error:
+ self.outs = "n_sent=%d n_rcvd=%d n_thru=%d n_waypoint_rcvd=%d" % (self.n_sent, self.n_rcvd, self.n_thru, self.n_waypoint_rcvd)
print (self.outs)
def send_client(self):
diff --git a/tests/system_tests_open_properties.py b/tests/system_tests_open_properties.py
index 79a6378..dd7fe66 100644
--- a/tests/system_tests_open_properties.py
+++ b/tests/system_tests_open_properties.py
@@ -274,7 +274,7 @@ class OpenPropertiesQdManageTest(TestCase):
input=input,
timeout=TIMEOUT)
rc = json.loads(output)
- self.assertTrue("openProperties" in rc)
+ self.assertIn("openProperties", rc)
self.assertEqual(op, rc["openProperties"])
client = client_class(router)
diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py
index b89bc41..ab4b060 100644
--- a/tests/system_tests_policy.py
+++ b/tests/system_tests_policy.py
@@ -942,7 +942,7 @@ class PolicyLinkNamePatternTest(TestCase):
qdm_out = self.run_qdmanage('update --type=vhost --name=vhost/$default --stdin', input=self.default_patterns())
except Exception as e:
self.assertTrue(False, msg=('Error running qdmanage %s' % str(e)))
- self.assertFalse("PolicyError" in qdm_out)
+ self.assertNotIn("PolicyError", qdm_out)
# attempt an create that should be rejected
qdm_out = "<not written>"
@@ -1060,7 +1060,7 @@ class PolicyHostamePatternTest(TestCase):
qdm_out = self.run_qdmanage('create --type=vhost --name=#.#.0.0 --stdin', input=self.disallowed_hostname())
except Exception as e:
self.assertTrue("pattern conflicts" in str(e), msg=('Error running qdmanage %s' % str(e)))
- self.assertFalse("222222" in qdm_out)
+ self.assertNotIn("222222", qdm_out)
class VhostPolicyFromRouterConfig(TestCase):
diff --git a/tests/system_tests_protocol_settings.py b/tests/system_tests_protocol_settings.py
index 454f0c0..11db95f 100644
--- a/tests/system_tests_protocol_settings.py
+++ b/tests/system_tests_protocol_settings.py
@@ -54,12 +54,12 @@ class MaxFrameMaxSessionFramesTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# max-frame is from the config
- self.assertTrue(' max-frame-size=2048,' in open_lines[0])
+ self.assertIn(' max-frame-size=2048,', open_lines[0])
# channel-max is default
- self.assertTrue(" channel-max=32767" in open_lines[0])
+ self.assertIn(" channel-max=32767", open_lines[0])
begin_lines = [s for s in log_lines if "-> @begin" in s]
# incoming-window is from the config
- self.assertTrue(" incoming-window=10," in begin_lines[0] )
+ self.assertIn(" incoming-window=10,", begin_lines[0] )
class MaxSessionsTest(TestCase):
@@ -88,7 +88,7 @@ class MaxSessionsTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# channel-max is 9
- self.assertTrue(" channel-max=9" in open_lines[0])
+ self.assertIn(" channel-max=9", open_lines[0])
class MaxSessionsZeroTest(TestCase):
@@ -117,7 +117,7 @@ class MaxSessionsZeroTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# channel-max is 0. Should get proton default 32767
- self.assertTrue(" channel-max=32767" in open_lines[0])
+ self.assertIn(" channel-max=32767", open_lines[0])
class MaxSessionsLargeTest(TestCase):
@@ -146,7 +146,7 @@ class MaxSessionsLargeTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# channel-max is 0. Should get proton default 32767
- self.assertTrue(" channel-max=32767" in open_lines[0])
+ self.assertIn(" channel-max=32767", open_lines[0])
class MaxFrameSmallTest(TestCase):
@@ -175,7 +175,7 @@ class MaxFrameSmallTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# if frame size <= 512 proton set min of 512
- self.assertTrue(" max-frame-size=512" in open_lines[0])
+ self.assertIn(" max-frame-size=512", open_lines[0])
class MaxFrameDefaultTest(TestCase):
@@ -204,7 +204,7 @@ class MaxFrameDefaultTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# if frame size not set then a default is used
- self.assertTrue(" max-frame-size=16384" in open_lines[0])
+ self.assertIn(" max-frame-size=16384", open_lines[0])
class MaxSessionFramesDefaultTest(TestCase):
@@ -233,15 +233,15 @@ class MaxSessionFramesDefaultTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# if frame size not set then a default is used
- self.assertTrue(" max-frame-size=16384" in open_lines[0])
+ self.assertIn(" max-frame-size=16384", open_lines[0])
begin_lines = [s for s in log_lines if "-> @begin" in s]
# incoming-window should be 2^31-1 (64-bit) or
# (2^31-1) / max-frame-size (32-bit)
is_64bits = sys.maxsize > 2 ** 32
expected = " incoming-window=2147483647," if is_64bits else \
(" incoming-window=%d," % int(2147483647 / 16384))
- self.assertTrue(expected in begin_lines[0],
- "Expected:'%s' not found in '%s'" % (expected, begin_lines[0]))
+ #self.assertIn(expected, begin_lines[0], "Expected:'%s' not found in '%s'" % (expected, begin_lines[0]))
+ self.assertIn(expected, begin_lines[0])
class MaxFrameMaxSessionFramesZeroTest(TestCase):
@@ -274,15 +274,14 @@ class MaxFrameMaxSessionFramesZeroTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "-> @open" in s]
# max-frame gets set to protocol min
- self.assertTrue(' max-frame-size=512,' in open_lines[0])
+ self.assertIn(' max-frame-size=512,', open_lines[0])
begin_lines = [s for s in log_lines if "-> @begin" in s]
# incoming-window should be 2^31-1 (64-bit) or
# (2^31-1) / max-frame-size (32-bit)
is_64bits = sys.maxsize > 2 ** 32
expected = " incoming-window=2147483647," if is_64bits else \
(" incoming-window=%d," % int(2147483647 / 512))
- self.assertTrue(expected in begin_lines[0],
- "Expected:'%s' not found in '%s'" % (expected, begin_lines[0]))
+ self.assertIn(expected, begin_lines[0])
class ConnectorSettingsDefaultTest(TestCase):
@@ -331,16 +330,15 @@ class ConnectorSettingsDefaultTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "<- @open" in s]
# defaults
- self.assertTrue(' max-frame-size=16384,' in open_lines[0])
- self.assertTrue(' channel-max=32767,' in open_lines[0])
+ self.assertIn(' max-frame-size=16384,', open_lines[0])
+ self.assertIn(' channel-max=32767,', open_lines[0])
begin_lines = [s for s in log_lines if "<- @begin" in s]
# incoming-window should be 2^31-1 (64-bit) or
# (2^31-1) / max-frame-size (32-bit)
is_64bits = sys.maxsize > 2 ** 32
expected = " incoming-window=2147483647," if is_64bits else \
(" incoming-window=%d," % int(2147483647 / 16384))
- self.assertTrue(expected in begin_lines[0],
- "Expected:'%s' not found in '%s'" % (expected, begin_lines[0]))
+ self.assertIn(expected, begin_lines[0])
class ConnectorSettingsNondefaultTest(TestCase):
@@ -390,11 +388,11 @@ class ConnectorSettingsNondefaultTest(TestCase):
log_lines = router_log.read().split("\n")
open_lines = [s for s in log_lines if "<- @open" in s]
# nondefaults
- self.assertTrue(' max-frame-size=2048,' in open_lines[0])
- self.assertTrue(' channel-max=19,' in open_lines[0])
+ self.assertIn(' max-frame-size=2048,', open_lines[0])
+ self.assertIn(' channel-max=19,', open_lines[0])
begin_lines = [s for s in log_lines if "<- @begin" in s]
# nondefaults
- self.assertTrue(" incoming-window=10," in begin_lines[0])
+ self.assertIn(" incoming-window=10,", begin_lines[0])
if __name__ == '__main__':
diff --git a/tests/system_tests_qdmanage.py b/tests/system_tests_qdmanage.py
index 8be9399..46e1fb1 100644
--- a/tests/system_tests_qdmanage.py
+++ b/tests/system_tests_qdmanage.py
@@ -303,11 +303,11 @@ class QdmanageTest(TestCase):
self.assertEqual(output[0]['name'], "test-address")
self.assertEqual(output[0]['distribution'], "multicast")
self.assertEqual(output[0]['prefix'], "abcd")
- self.assertTrue('pattern' not in output[0])
+ self.assertNotIn('pattern', output[0])
self.assertEqual(output[1]['name'], "pattern-address")
self.assertEqual(output[1]['distribution'], "closest")
self.assertEqual(output[1]['pattern'], "a/*/b/#/c")
- self.assertTrue('prefix' not in output[1])
+ self.assertNotIn('prefix', output[1])
def test_create_address(self):
long_type = 'org.apache.qpid.dispatch.router.config.address'
diff --git a/tests/system_tests_qdstat.py b/tests/system_tests_qdstat.py
index 40b4bf1..a53f596 100644
--- a/tests/system_tests_qdstat.py
+++ b/tests/system_tests_qdstat.py
@@ -147,29 +147,29 @@ class QdstatTest(system_test.TestCase):
def test_qdstat_no_args(self):
outs = self.run_qdstat(args=None)
- self.assertTrue("Presettled Count" in outs)
- self.assertTrue("Dropped Presettled Count" in outs)
- self.assertTrue("Accepted Count" in outs)
- self.assertTrue("Rejected Count" in outs)
- self.assertTrue("Deliveries from Route Container" in outs)
- self.assertTrue("Deliveries to Route Container" in outs)
- self.assertTrue("Deliveries to Fallback" in outs)
- self.assertTrue("Egress Count" in outs)
- self.assertTrue("Ingress Count" in outs)
- self.assertTrue("Uptime" in outs)
+ self.assertIn("Presettled Count", outs)
+ self.assertIn("Dropped Presettled Count", outs)
+ self.assertIn("Accepted Count", outs)
+ self.assertIn("Rejected Count", outs)
+ self.assertIn("Deliveries from Route Container", outs)
+ self.assertIn("Deliveries to Route Container", outs)
+ self.assertIn("Deliveries to Fallback", outs)
+ self.assertIn("Egress Count", outs)
+ self.assertIn("Ingress Count", outs)
+ self.assertIn("Uptime", outs)
def test_qdstat_no_other_args_csv(self):
outs = self.run_qdstat(["--csv"])
- self.assertTrue("Presettled Count" in outs)
- self.assertTrue("Dropped Presettled Count" in outs)
- self.assertTrue("Accepted Count" in outs)
- self.assertTrue("Rejected Count" in outs)
- self.assertTrue("Deliveries from Route Container" in outs)
- self.assertTrue("Deliveries to Route Container" in outs)
- self.assertTrue("Deliveries to Fallback" in outs)
- self.assertTrue("Egress Count" in outs)
- self.assertTrue("Ingress Count" in outs)
- self.assertTrue("Uptime" in outs)
+ self.assertIn("Presettled Count", outs)
+ self.assertIn("Dropped Presettled Count", outs)
+ self.assertIn("Accepted Count", outs)
+ self.assertIn("Rejected Count", outs)
+ self.assertIn("Deliveries from Route Container", outs)
+ self.assertIn("Deliveries to Route Container", outs)
+ self.assertIn("Deliveries to Fallback", outs)
+ self.assertIn("Egress Count", outs)
+ self.assertIn("Ingress Count", outs)
+ self.assertIn("Uptime", outs)
def test_address_priority(self):
out = self.run_qdstat(['--address'])
@@ -239,8 +239,8 @@ class QdstatTest(system_test.TestCase):
if out.strip() == "No memory statistics available":
# router built w/o memory pools enabled]
return self.skipTest("Router's memory pools disabled")
- self.assertTrue("QDR.A" in out)
- self.assertTrue("UTC" in out)
+ self.assertIn("QDR.A", out)
+ self.assertIn("UTC", out)
regexp = r'qdr_address_t\s+[0-9]+'
assert re.search(regexp, out, re.I), "Can't find '%s' in '%s'" % (regexp, out)
@@ -249,20 +249,20 @@ class QdstatTest(system_test.TestCase):
if out.strip() == "No memory statistics available":
# router built w/o memory pools enabled]
return self.skipTest("Router's memory pools disabled")
- self.assertTrue("QDR.A" in out)
- self.assertTrue("UTC" in out)
+ self.assertIn("QDR.A", out)
+ self.assertIn("UTC", out)
regexp = r'qdr_address_t","[0-9]+'
assert re.search(regexp, out, re.I), "Can't find '%s' in '%s'" % (regexp, out)
def test_policy(self):
out = self.run_qdstat(['--policy'])
- self.assertTrue("Maximum Concurrent Connections" in out)
- self.assertTrue("Total Denials" in out)
+ self.assertIn("Maximum Concurrent Connections", out)
+ self.assertIn("Total Denials", out)
def test_policy_csv(self):
out = self.run_qdstat(['-p', "--csv"])
- self.assertTrue("Maximum Concurrent Connections" in out)
- self.assertTrue("Total Denials" in out)
+ self.assertIn("Maximum Concurrent Connections", out)
+ self.assertIn("Total Denials", out)
def test_log(self):
self.run_qdstat(['--log', '--limit=5'], r'AGENT \(debug\).*GET-LOG')
@@ -509,41 +509,41 @@ class QdstatTestVhostPolicy(system_test.TestCase):
def test_vhost(self):
out = self.run_qdstat(['--vhosts'])
- self.assertTrue("Vhosts" in out)
- self.assertTrue("allowUnknownUser" in out)
+ self.assertIn("Vhosts", out)
+ self.assertIn("allowUnknownUser", out)
def test_vhost_csv(self):
out = self.run_qdstat(['--vhosts', '--csv'])
- self.assertTrue("Vhosts" in out)
- self.assertTrue("allowUnknownUser" in out)
+ self.assertIn("Vhosts", out)
+ self.assertIn("allowUnknownUser", out)
def test_vhostgroups(self):
out = self.run_qdstat(['--vhostgroups'])
- self.assertTrue("Vhost Groups" in out)
- self.assertTrue("allowAdminStatusUpdate" in out)
- self.assertTrue("Vhost '$default' UserGroup '$default'" in out)
- self.assertTrue("Vhost '$default' UserGroup 'HGCrawler'" in out)
+ self.assertIn("Vhost Groups", out)
+ self.assertIn("allowAdminStatusUpdate", out)
+ self.assertIn("Vhost '$default' UserGroup '$default'", out)
+ self.assertIn("Vhost '$default' UserGroup 'HGCrawler'", out)
def test_vhostgroups_csv(self):
out = self.run_qdstat(['--vhostgroups', '--csv'])
- self.assertTrue("Vhost Groups" in out)
- self.assertTrue("allowAdminStatusUpdate" in out)
- self.assertTrue("Vhost '$default' UserGroup '$default'" in out)
- self.assertTrue("Vhost '$default' UserGroup 'HGCrawler'" in out)
+ self.assertIn("Vhost Groups", out)
+ self.assertIn("allowAdminStatusUpdate", out)
+ self.assertIn("Vhost '$default' UserGroup '$default'", out)
+ self.assertIn("Vhost '$default' UserGroup 'HGCrawler'", out)
def test_vhoststats(self):
out = self.run_qdstat(['--vhoststats'])
- self.assertTrue("Vhost Stats" in out)
- self.assertTrue("maxMessageSizeDenied" in out)
- self.assertTrue("Vhost User Stats" in out)
- self.assertTrue("remote hosts" in out)
+ self.assertIn("Vhost Stats", out)
+ self.assertIn("maxMessageSizeDenied", out)
+ self.assertIn("Vhost User Stats", out)
+ self.assertIn("remote hosts", out)
def test_vhoststats_csv(self):
out = self.run_qdstat(['--vhoststats', '--csv'])
- self.assertTrue("Vhost Stats" in out)
- self.assertTrue("maxMessageSizeDenied" in out)
- self.assertTrue("Vhost User Stats" in out)
- self.assertTrue("remote hosts" in out)
+ self.assertIn("Vhost Stats", out)
+ self.assertIn("maxMessageSizeDenied", out)
+ self.assertIn("Vhost User Stats", out)
+ self.assertIn("remote hosts", out)
diff --git a/tests/system_tests_router_mesh.py b/tests/system_tests_router_mesh.py
index 980c844..6d7418a 100644
--- a/tests/system_tests_router_mesh.py
+++ b/tests/system_tests_router_mesh.py
@@ -177,7 +177,7 @@ class ThreeRouterTest(TestCase):
ats.wait()
self.assertTrue(False) # expect exception
except AsyncTestSender.TestSenderException as exc:
- self.assertTrue("link error" in ats.error)
+ self.assertIn("link error", ats.error)
def test_04_unavailable_anonymous_link_attach(self):
"""
diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py
index 7996029..2e7c07d 100644
--- a/tests/system_tests_sasl_plain.py
+++ b/tests/system_tests_sasl_plain.py
@@ -503,7 +503,7 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
results = local_node.query(type='org.apache.qpid.dispatch.connection').results
# sslProto should be TLSv1.x
- self.assertTrue(u'TLSv1' in results[0][10])
+ self.assertIn(u'TLSv1', results[0][10])
# role should be inter-router
self.assertEqual(u'inter-router', results[0][3])
@@ -696,7 +696,7 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
self.assertTrue(found, "Connection to %s not found" % search)
# sslProto should be TLSv1.x
- self.assertTrue(u'TLSv1' in results[N][10])
+ self.assertIn(u'TLSv1', results[N][10])
# role should be inter-router
self.assertEqual(u'inter-router', results[N][3])
diff --git a/tests/system_tests_ssl.py b/tests/system_tests_ssl.py
index 1e0cd0c..bd88592 100644
--- a/tests/system_tests_ssl.py
+++ b/tests/system_tests_ssl.py
@@ -764,8 +764,7 @@ class RouterTestSslInterRouter(RouterTestSslBase):
router_nodes = self.get_router_nodes()
self.assertTrue(router_nodes)
for node in router_nodes:
- self.assertTrue(node in self.connected_tls_sasl_routers,
- "%s should be connected" % node)
+ self.assertIn(node, self.connected_tls_sasl_routers)
# Router A and B are always expected (no tls version restriction)
expected_nodes = len(self.connected_tls_sasl_routers)
diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index c2aec27..6d2d711 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -269,9 +269,9 @@ class TwoRouterTest(TestCase):
pass
# verify expected count == actual count
- self.assertTrue("ERROR" not in msgs_recvd)
+ self.assertNotIn("ERROR", msgs_recvd)
for a in addresses:
- self.assertTrue(a[0] in msgs_recvd)
+ self.assertIn(a[0], msgs_recvd)
self.assertEqual(a[1], msgs_recvd[a[0]])
for M in receivers:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org