[ignite] branch master updated: IGNITE-17584 [ducktests] Allow time units in the control.sh transactions output parser (#10218)

[iv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a6ff6f4aa1 IGNITE-17584 [ducktests] Allow time units in the control.sh transactions output parser (#10218)
4a6ff6f4aa1 is described below

commit 4a6ff6f4aa1994b39bf40cc8ad80ac5df704d569
Author: Sergey Korotkov <se...@gmail.com>
AuthorDate: Mon Aug 29 14:30:18 2022 +0700

    IGNITE-17584 [ducktests] Allow time units in the control.sh transactions output parser (#10218)
---
 modules/ducktests/tests/ignitetest/services/utils/control_utility.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
index 4d065162742..45b55bea54e 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
@@ -289,10 +289,11 @@ class ControlUtility:
         tx_pattern = re.compile(
             "Tx: \\[xid=(?P<xid>[^\\s]+), "
             "label=(?P<label>[^\\s]+), state=(?P<state>[^\\s]+), "
-            "startTime=(?P<start_time>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3}), duration=(?P<duration>\\d+), "
+            "startTime=(?P<start_time>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3}), "
+            "duration=(?P<duration>\\d+)( sec)?, "
             "isolation=(?P<isolation>[^\\s]+), concurrency=(?P<concurrency>[^\\s]+), "
             "topVer=AffinityTopologyVersion \\[topVer=(?P<top_ver>\\d+), minorTopVer=(?P<minor_top_ver>\\d+)\\], "
-            "timeout=(?P<timeout>\\d+), size=(?P<size>\\d+), dhtNodes=\\[(?P<dht_nodes>.*)\\], "
+            "timeout=(?P<timeout>\\d+)( sec)?, size=(?P<size>\\d+), dhtNodes=\\[(?P<dht_nodes>.*)\\], "
             "nearXid=(?P<near_xid>[^\\s]+), parentNodeIds=\\[(?P<parent_nodes>.*)\\]\\]")
 
         str_fields = ['xid', 'label', 'state', 'isolation', 'concurrency', 'near_xid']