From: Song Jiale <songx.jiale@intel.com>
To: dts@dpdk.org
Cc: Song Jiale <songx.jiale@intel.com>
Subject: [dts] [PATCH V2] tests/rte_flow_common: optimize scripts
Date: Fri, 11 Nov 2022 11:38:46 +0000 [thread overview]
Message-ID: <20221111113846.26996-1-songx.jiale@intel.com> (raw)
1. some packages that mismatch the rule do not have hash values.
add a parameter "check_hash_num" to determine whether to detect the number of hash values.
2. change "log_msg" to a string.
Signed-off-by: Song Jiale <songx.jiale@intel.com>
---
v2:
-"log_msg" need to return a string, not an exception.
tests/rte_flow_common.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/rte_flow_common.py b/tests/rte_flow_common.py
index 02c85f85..b692ba06 100644
--- a/tests/rte_flow_common.py
+++ b/tests/rte_flow_common.py
@@ -133,7 +133,7 @@ def check_output_log_queue_region_mismatched(out, func_param, expect_results):
try:
check_queue(out, expect_pkts, check_param, stats=False)
except Exception as ex:
- log_msg = ex
+ log_msg = str(ex)
return False, log_msg
else:
log_msg = ""
@@ -156,7 +156,7 @@ def check_output_log_in_queue_mismatched(out, func_param, expect_results):
try:
check_queue(out, expect_pkts, check_param, stats=False)
except Exception as ex:
- log_msg = ex
+ log_msg = str(ex)
return False, log_msg
else:
log_msg = ""
@@ -346,7 +346,7 @@ def verify(passed, description):
raise AssertionError(description)
-def check_rss(out, pkt_num, check_param, stats=True):
+def check_rss(out, pkt_num, check_param, stats=True, check_hash_num=True):
"""
check whether the packet directed by rss or not according to the specified parameters
:param out: information received by testpmd after sending packets and port statistics
@@ -359,7 +359,8 @@ def check_rss(out, pkt_num, check_param, stats=True):
rxq = check_param.get("rxq")
p = re.compile("RSS\shash=(\w+)\s-\sRSS\squeue=(\w+)")
pkt_info = p.findall(out)
- verify(len(pkt_info) == pkt_num, "some packets no hash:{}".format(p.pattern))
+ if check_hash_num:
+ verify(len(pkt_info) == pkt_num, "some packets no hash:{}".format(p.pattern))
pkt_queue = set([int(i[1], 16) for i in pkt_info])
if stats:
verify(
@@ -400,7 +401,7 @@ def check_queue(out, pkt_num, check_param, stats=True):
if not any(q in queue for q in pkt_queue):
print((GREEN("pass: queue id %s not matched" % pkt_queue)))
else:
- check_rss(out, pkt_num, check_param, stats=True)
+ check_rss(out, pkt_num, check_param, stats=True, check_hash_num=False)
return pkt_queue
else:
raise Exception("got wrong output, not match pattern %s" % p.pattern)
--
2.17.1
next reply other threads:[~2022-11-11 3:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 11:38 Song Jiale [this message]
2022-11-18 2:23 ` Li, WeiyuanX
2022-11-18 8:50 ` lijuan.tu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221111113846.26996-1-songx.jiale@intel.com \
--to=songx.jiale@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).