This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new f14a4b8 DISPATCH-2266: Added more logging to see where the test stalls
f14a4b8 is described below
commit f14a4b8d14f9c1280461ee43c306b0866f09535d
Author: Ganesh Murthy <[email protected]>
AuthorDate: Fri Nov 5 14:12:54 2021 -0400
DISPATCH-2266: Added more logging to see where the test stalls
---
tests/system_test.py | 13 +++++++------
tests/system_tests_edge_router.py | 20 +++++++++++++++-----
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/tests/system_test.py b/tests/system_test.py
index f0e5ee6..0b6390c 100755
--- a/tests/system_test.py
+++ b/tests/system_test.py
@@ -896,7 +896,7 @@ class AsyncTestReceiver(MessagingHandler):
%
self._async_receiver.num_queue_puts)
def __init__(self, address, source, conn_args=None, container_id=None,
- wait=True, recover_link=False, msg_args=None):
+ wait=True, recover_link=False, msg_args=None,
print_to_console=False):
if msg_args is None:
msg_args = {}
super(AsyncTestReceiver, self).__init__(**msg_args)
@@ -913,7 +913,7 @@ class AsyncTestReceiver(MessagingHandler):
self._recover_count = 0
self._stop_thread = False
self._thread = Thread(target=self._main)
- self._logger = Logger(title="AsyncTestReceiver %s" % cid)
+ self._logger = Logger(title="AsyncTestReceiver %s" % cid,
print_to_console=print_to_console)
self._thread.daemon = True
self._thread.start()
self.num_queue_puts = 0
@@ -998,7 +998,7 @@ class AsyncTestSender(MessagingHandler):
super(AsyncTestSender.TestSenderException, self).__init__(error)
def __init__(self, address, target, count=1, message=None,
- container_id=None, presettle=False):
+ container_id=None, presettle=False, print_to_console=False):
super(AsyncTestSender, self).__init__(auto_accept=False,
auto_settle=False)
self.address = address
@@ -1012,7 +1012,6 @@ class AsyncTestSender(MessagingHandler):
self.sent = 0
self.error = None
self.link_stats = None
-
self._conn = None
self._sender = None
self._message = message or Message(body="test")
@@ -1022,7 +1021,7 @@ class AsyncTestSender(MessagingHandler):
self._link_name = "%s-%s" % (cid, "tx")
self._thread = Thread(target=self._main)
self._thread.daemon = True
- self._logger = Logger(title="AsyncTestSender %s" % cid)
+ self._logger = Logger(title="AsyncTestSender %s" % cid,
print_to_console=print_to_console)
self._thread.start()
self.msg_stats = "self.sent=%d, self.accepted=%d, self.released=%d,
self.modified=%d, self.rejected=%d"
@@ -1039,14 +1038,16 @@ class AsyncTestSender(MessagingHandler):
def wait(self):
# don't stop it - wait until everything is sent
+ self._logger.log("AsyncTestSender wait: about to join thread")
self._thread.join(timeout=TIMEOUT)
- self._logger.log("thread done")
+ self._logger.log("AsyncTestSender wait: thread done")
assert not self._thread.is_alive(), "sender did not complete"
if self.error:
raise AsyncTestSender.TestSenderException(self.error)
del self._sender
del self._conn
del self._container
+ self._logger.log("AsyncTestSender wait: no errors in wait")
def on_start(self, event):
self._conn = self._container.connect(self.address)
diff --git a/tests/system_tests_edge_router.py
b/tests/system_tests_edge_router.py
index 34073c6..6b7653e 100644
--- a/tests/system_tests_edge_router.py
+++ b/tests/system_tests_edge_router.py
@@ -1617,20 +1617,29 @@ class LinkRouteProxyTest(TestCase):
while self._get_address(router, address):
sleep(0.1)
- def _test_traffic(self, sender, receiver, address, count=5, message=None):
+ def _test_traffic(self, sender, receiver, address, count=5, message=None,
logger=None):
"""Generate message traffic between two normal clients"""
error = None
- tr = AsyncTestReceiver(receiver, address)
+ if logger:
+ logger.log("_test_traffic begin")
+ tr = AsyncTestReceiver(receiver, address, print_to_console=True)
+ if logger:
+ logger.log("_test_traffic AsyncTestReceiver created")
ts = AsyncTestSender(sender, address, count,
- message=message)
+ message=message, print_to_console=True)
+ if logger:
+ logger.log("_test_traffic AsyncTestSender created")
ts.wait() # wait until all sent
+ if logger:
+ logger.log("_test_traffic sender wait done")
for i in range(count):
try:
tr.queue.get()
except AsyncTestReceiver.Empty:
error = "Sender Stats=" + ts.get_msg_stats() + "\n Receiver
Queue Stats=" + tr.get_queue_stats()
-
tr.stop()
+ if logger:
+ logger.log("_test_traffic receiver queue get done")
if error:
tr.dump_log()
ts.dump_log()
@@ -1903,7 +1912,8 @@ class LinkRouteProxyTest(TestCase):
self.INT_B.listener,
"CfgLinkRoute1/hi",
count=5,
- message=test_msg)
+ message=test_msg,
+ logger=logger)
logger.log("test_51_link_route_proxy_configured _test_traffic done on
CfgLinkRoute1/hi")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
