test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V2] tests/TestSuite_shutdown_api:fixed differences brought about by speed units
@ 2020-12-01 17:57 Chen, Lingli
  2020-12-01  9:23 ` Chen, LingliX
  2020-12-07  7:42 ` Tu, Lijuan
  0 siblings, 2 replies; 3+ messages in thread
From: Chen, Lingli @ 2020-12-01 17:57 UTC (permalink / raw)
  To: dts; +Cc: Chen, Lingli, Chen

V2:optimize script to fixed differences brought about by speed units
   Sagepond nic only support 1000baseT and 10000baseT

V1:fixed differences brought about by speed units

Signed-off-by: Chen, Lingli <linglix.chen@intel.com>
---
 tests/TestSuite_shutdown_api.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index 1e98c64..c647870 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -501,7 +501,7 @@ class TestShutdownApi(TestCase):
                 if config[0] != '1000' or '10000':
                     continue
             elif self.nic in ["sagepond"]:
-                if config[0] != '1000' and '10000':
+                if config[0] not in ['1000', '10000']:
                     continue
             self.dut.send_expect("port stop all", "testpmd> ", 100)
             for port in self.ports:
@@ -515,8 +515,13 @@ class TestShutdownApi(TestCase):
                 out = self.dut.send_expect("show port info %s" % port, "testpmd>")
                 self.verify("Link status: up" in out,
                             "Wrong link status reported by the dut")
-                self.verify("Link speed: %s Mbps" % config[0] in out,
-                            "Wrong speed reported by the dut")
+                if int(config[0]) < 1000:
+                    self.verify("Link speed: %s Mbps" % config[0] in out,
+                                 "Wrong speed reported by the dut")
+                else:
+                    num =int(int(config[0])/1000)
+                    self.verify("Link speed: %d Gbps" % num in out,
+                                 "Wrong speed reported by the dut")
                 self.verify("Link duplex: %s-duplex" % config[1].lower() in out,
                             "Wrong link type reported by the dut")
                 out = self.tester.send_expect(
@@ -547,7 +552,7 @@ class TestShutdownApi(TestCase):
         if not self.check_linkspeed_config(configs):
             return
 
-        result_linkspeed_scanner = r"Link\s*speed:\s([0-9]+)\s*Mbps"
+        result_linkspeed_scanner = r"Link\s*speed:\s([0-9]+)\s*(\S+)"
         linkspeed_scanner = re.compile(result_linkspeed_scanner, re.DOTALL)
         result_linktype_scanner = r"Link\s*duplex:\s*(\S*)\s*-\s*duplex"
         linktype_scanner = re.compile(result_linktype_scanner, re.DOTALL)
@@ -577,10 +582,13 @@ class TestShutdownApi(TestCase):
 
             out = self.vm0_testpmd.execute_cmd('show port info all')
 
-            linkspeed = linkspeed_scanner.findall(out)
+            linkspeed = linkspeed_scanner.findall(out)[0]
             linktype = linktype_scanner.findall(out)
 
-            self.verify(config[0] in linkspeed,
+            actual_speed = int(linkspeed[0])
+            if linkspeed[1] == "Gbps":
+                actual_speed = actual_speed * 1000
+            self.verify(config[0] == str(actual_speed),
                         "Wrong VF speed reported by the self.tester.")
             self.verify(config[1].lower() == linktype[0].lower(),
                         "Wrong VF link type reported by the self.tester.")
-- 
2.17.1


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-07  7:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-01 17:57 [dts] [PATCH V2] tests/TestSuite_shutdown_api:fixed differences brought about by speed units Chen, Lingli
2020-12-01  9:23 ` Chen, LingliX
2020-12-07  7:42 ` Tu, Lijuan

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).