test suite reviews and discussions
 help / color / mirror / Atom feed
From: Jiale Song <songx.jiale@intel.com>
To: dts@dpdk.org
Cc: Jiale Song <songx.jiale@intel.com>
Subject: [dts] [PATCH V2] tests/link_status_interrupt: optimize the method of checking priv_flags
Date: Thu, 28 Oct 2021 15:12:11 +0800	[thread overview]
Message-ID: <1635405131-104331-1-git-send-email-songx.jiale@intel.com> (raw)

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 tests/TestSuite_link_status_interrupt.py | 37 +++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/tests/TestSuite_link_status_interrupt.py b/tests/TestSuite_link_status_interrupt.py
index bdb43f42..bdee2155 100755
--- a/tests/TestSuite_link_status_interrupt.py
+++ b/tests/TestSuite_link_status_interrupt.py
@@ -75,18 +75,29 @@ class TestLinkStatusInterrupt(TestCase):
         # check link-down-on-close flag
         self.flag = "link-down-on-close"
         for intf in self.intfs:
-            check_flag = "ethtool --show-priv-flags %s" % intf
             set_flag = "ethtool --set-priv-flags %s %s on" % (intf, self.flag)
-            out = self.tester.send_expect(check_flag, "#")
-            p = re.compile('%s\s+:\s+(\w+)' % self.flag)
-            res = re.search(p, out).group(1)
-            if res == "off":
-                self.tester.send_expect(set_flag, "#")
+            self.flag_stats = self.get_priv_flags_default_state(intf, self.flag)
+            if self.flag_stats == "off":
+                self.tester.send_expect(set_flag, "# ")
                 time.sleep(0.5)
-                out = self.tester.send_expect(check_flag, "#")
-                self.verify(re.search(p, out).group(1) == "on", "set %s %s on failed" % (intf, self.flag))
-            elif not res:
-                self.logger.info("NIC %s might not support this case" % intf)
+                self.verify(self.get_priv_flags_default_state(intf, self.flag) == "on", "set %s %s on failed" % (intf, self.flag))
+
+    def get_priv_flags_default_state(self, intf, flag):
+        '''
+
+        :param intf: nic name
+        :param flag: priv-flags flag
+        :return: flag default state
+        '''
+        check_flag = "ethtool --show-priv-flags %s" % intf
+        out = self.tester.send_expect(check_flag, "# ")
+        p = re.compile('%s\s+:\s+(\w+)' % flag)
+        default_state = re.search(p, out)
+        if default_state:
+            return default_state.group(1)
+        else:
+            self.logger.info("NIC %s may be not find %s" % (intf, self.flag))
+            return False
 
     def set_link_status_and_verify(self, dutPort, status):
         """
@@ -94,7 +105,7 @@ class TestLinkStatusInterrupt(TestCase):
         """
         self.intf = self.tester.get_interface(
             self.tester.get_local_port(dutPort))
-        if self.dut.get_os_type() != 'freebsd':
+        if self.dut.get_os_type() != 'freebsd' and self.flag_stats:
             self.tester.send_expect("ethtool --set-priv-flags %s link-down-on-close on" % self.intf, "#", 10)
         self.tester.send_expect("ifconfig %s %s" %
                                 (self.intf, status.lower()), "# ", 10)
@@ -210,6 +221,6 @@ class TestLinkStatusInterrupt(TestCase):
         """
         Run after each test suite.
         """
-        if self.dut.get_os_type() != 'freebsd':
+        if self.dut.get_os_type() != 'freebsd' and self.flag_stats:
             for intf in self.intfs:
-                self.tester.send_expect("ethtool --set-priv-flags %s %s off" % (intf, self.flag), "#", 10)
+                self.tester.send_expect("ethtool --set-priv-flags %s %s %s" % (intf, self.flag, self.flag_stats), "# ")
-- 
2.17.1


                 reply	other threads:[~2021-10-28  7:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1635405131-104331-1-git-send-email-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).