[dts] [PATCH V2] tests/cvl_advanced_iavf_rss:need quit testpmd to restore env

[dts] [PATCH V2] tests/cvl_advanced_iavf_rss:need quit testpmd to restore env

[Xie wei]

need quit testpmd before rmmoding ice.

Signed-off-by: Xie wei <weix.xie@intel.com>
---
 tests/TestSuite_cvl_advanced_iavf_rss.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py b/tests/TestSuite_cvl_advanced_iavf_rss.py
index 1e6ac19..eaf55fa 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss.py
+++ b/tests/TestSuite_cvl_advanced_iavf_rss.py
@@ -1112,10 +1112,15 @@ class AdvancedIavfRSSTest(TestCase):
         self.create_testpmd_command(self.vf0_prop)
         error_rule = ["flow create 0 ingress pattern eth / ipv4 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end / end ",
                       "flow create 0 ingress pattern eth / ipv6 / udp / pfcp / end actions rss types pfcp end key_len 0 queues end / end ", ]
-        for rule in error_rule:
-            out = self.pmd_output.execute_cmd(rule)
-            self.verify("Failed to create flow" in out, "Rule can be created")
-        self.replace_pkg(self.comms_pkg_name)
+        try:
+            for rule in error_rule:
+                out = self.pmd_output.execute_cmd(rule)
+                self.verify("Failed to create flow" in out, "Rule can be created")
+        except Exception as e:
+            raise Exception(e)
+        finally:
+            self.pmd_output.quit()
+            self.replace_pkg(self.comms_pkg_name)
 
     def replace_pkg(self, pkg):
         self.dut_session.send_expect("cd %s" % self.ddp_fdir, "# ")
-- 
2.17.1

Re: [dts] [PATCH V2] tests/cvl_advanced_iavf_rss:need quit testpmd to restore env

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Xie wei
> Sent: 2020年7月2日 10:54
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V2] tests/cvl_advanced_iavf_rss:need quit testpmd to
> restore env
> 
> need quit testpmd before rmmoding ice.
> 
> Signed-off-by: Xie wei <weix.xie@intel.com>
> ---
>  tests/TestSuite_cvl_advanced_iavf_rss.py | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py
> b/tests/TestSuite_cvl_advanced_iavf_rss.py
> index 1e6ac19..eaf55fa 100644
> --- a/tests/TestSuite_cvl_advanced_iavf_rss.py
> +++ b/tests/TestSuite_cvl_advanced_iavf_rss.py
> @@ -1112,10 +1112,15 @@ class AdvancedIavfRSSTest(TestCase):
>          self.create_testpmd_command(self.vf0_prop)
>          error_rule = ["flow create 0 ingress pattern eth / ipv4 / udp / pfcp / end
> actions rss types pfcp end key_len 0 queues end / end ",
>                        "flow create 0 ingress pattern eth / ipv6 / udp / pfcp / end actions
> rss types pfcp end key_len 0 queues end / end ", ]
> -        for rule in error_rule:
> -            out = self.pmd_output.execute_cmd(rule)
> -            self.verify("Failed to create flow" in out, "Rule can be created")
> -        self.replace_pkg(self.comms_pkg_name)
> +        try:
> +            for rule in error_rule:
> +                out = self.pmd_output.execute_cmd(rule)
> +                self.verify("Failed to create flow" in out, "Rule can be created")
> +        except Exception as e:
> +            raise Exception(e)
> +        finally:
> +            self.pmd_output.quit()
> +            self.replace_pkg(self.comms_pkg_name)
> 
>      def replace_pkg(self, pkg):
>          self.dut_session.send_expect("cd %s" % self.ddp_fdir, "# ")
> --
> 2.17.1