From: "xu,huilong" <huilongx.xu@intel.com>
To: dts@dpdk.org
Cc: "xu,huilong" <huilongx.xu@intel.com>
Subject: [dts] [PATCH V1] update dump test suite
Date: Mon, 8 Aug 2016 16:11:21 +0800 [thread overview]
Message-ID: <1470643881-3347-1-git-send-email-huilongx.xu@intel.com> (raw)
update list:
1. discard test_log_dump, because this function remove in dpdk.org
2. update ring_dump/mempool_dump case, ignore get ring/mempool struct info.
because ring struct is a internal struct, only get ring/mempool name. and check.
3. update dump_devargs case. update get pci address from portsInfo
Signed-off-by: xu,huilong <huilongx.xu@intel.com>
---
tests/TestSuite_unit_tests_dump.py | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py
index afdc256..26299f0 100644
--- a/tests/TestSuite_unit_tests_dump.py
+++ b/tests/TestSuite_unit_tests_dump.py
@@ -72,7 +72,7 @@ class TestUnitTestsDump(TestCase):
"""
pass
- def test_log_dump(self):
+ def discard_test_log_dump(self):
"""
Run history log dump test case.
"""
@@ -86,40 +86,31 @@ class TestUnitTestsDump(TestCase):
Run history log dump test case.
"""
self.dut.send_expect("./%s/app/test -n 1 -c ffff" % (self.target), "R.*T.*E.*>.*>", self.start_test_time)
+ self.dut.send_expect("mempool_autotest", "RTE>>", self.run_cmd_time * 2)
out = self.dut.send_expect("dump_ring", "RTE>>", self.run_cmd_time)
self.dut.send_expect("quit", "# ")
- elements = ['ring', 'address', 'flags', 'size', 'ct', 'ch', 'pt', 'ph', 'used', 'avail', 'watermark']
+ elements = ['ring', 'flags', 'size', 'ct', 'ch', 'pt', 'ph', 'used', 'avail', 'watermark']
match_regex = "ring <(.*?)>@0x(.*)\r\n"
- for element in elements[2:]:
- match_regex += " %s=(\d*)\r\n" % element
m = re.compile(r"%s" % match_regex, re.S)
result = m.search(out)
- ring_info = dict(zip(elements, result.groups()))
+ ring_info = result.groups()
- self.verify(ring_info['ring'] == 'MP_log_history', "Test failed")
+ self.verify(len(ring_info) == 2, "dump ring name failed")
def test_mempool_dump(self):
"""
Run mempool dump test case.
"""
self.dut.send_expect("./%s/app/test -n 1 -c ffff" % (self.target), "R.*T.*E.*>.*>", self.start_test_time)
+ self.dut.send_expect("mempool_autotest", "RTE>>", self.run_cmd_time * 2)
out = self.dut.send_expect("dump_mempool", "RTE>>", self.run_cmd_time * 2)
self.dut.send_expect("quit", "# ")
- elements = ['mempool', 'flags', 'ring', 'phys_addr', 'nb_mem_chunks', 'size', 'populated_size', 'header_size', 'elt_size',
- 'trailer_size', 'total_obj_size', 'private_data_size', 'avg bytes/object', 'cache infos','cache_size', 'common_pool_count']
match_regex = "mempool <(.*?)>@0x(.*?)\r\n"
- for element in elements[1:]:
- if element == 'cache_size':
- match_regex += " %s=(.*?)\r\n" % element
- elif element == 'cache infos':
- match_regex += " %s:\r\n" % element
- else:
- match_regex += " %s=(.*?)\r\n" % element
m = re.compile(r"%s" % match_regex, re.S)
result = m.search(out)
- mempool_info = dict(zip(elements, result.groups()))
+ mempool_info = result.groups()
- self.verify(mempool_info['mempool'] == 'log_history', "Test failed")
+ self.verify(len(mempool_info) == 2, "dump mempool name failed")
def test_physmem_dump(self):
"""
@@ -185,19 +176,22 @@ class TestUnitTestsDump(TestCase):
Run devargs dump test case.
"""
test_port = self.dut_ports[0]
- self.dut.send_expect("./%s/app/test -n 1 -c ffff -b %s"
- % (self.target, self.dut.ports_info[test_port]['pci']), "R.*T.*E.*>.*>", self.start_test_time)
+ pci_address = self.dut.ports_info[test_port]['pci'];
+ if not pci_address.startswith('0000:'):
+ pci_address = '0000:' + pci_address
+ self.dut.send_expect("./%s/app/test -n 1 -c ffff -b %s"
+ % (self.target, pci_address), "R.*T.*E.*>.*>", self.start_test_time)
out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2)
self.dut.send_expect("quit", "# ")
- black_str = "PCI blacklist %s" % self.dut.ports_info[test_port]['pci']
+ black_str = "PCI blacklist %s" % pci_address
self.verify(black_str in out, "Dump black list failed")
self.dut.send_expect("./%s/app/test -n 1 -c ffff -w %s"
- % (self.target, self.dut.ports_info[test_port]['pci']), "R.*T.*E.*>.*>", self.start_test_time)
+ % (self.target, pci_address), "R.*T.*E.*>.*>", self.start_test_time)
out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2)
self.dut.send_expect("quit", "# ")
- white_str = "PCI whitelist %s" % self.dut.ports_info[test_port]['pci']
+ white_str = "PCI whitelist %s" % pci_address
self.verify(white_str in out, "Dump white list failed")
def tear_down(self):
--
1.9.3
next reply other threads:[~2016-08-08 8:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-08 8:11 xu,huilong [this message]
2016-08-09 5:14 ` Liu, Yong
2016-08-09 5:47 ` Xu, HuilongX
2016-08-09 9:56 ` Liu, Yong
2016-08-10 7:50 ` Xu, HuilongX
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=1470643881-3347-1-git-send-email-huilongx.xu@intel.com \
--to=huilongx.xu@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).