test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V1] tests/flexible: add decorator for pkg check
@ 2021-03-30  6:36 Zhimin Huang
  2021-03-30  6:51 ` Huang, ZhiminX
  0 siblings, 1 reply; 3+ messages in thread
From: Zhimin Huang @ 2021-03-30  6:36 UTC (permalink / raw)
  To: dts; +Cc: Zhimin Huang

*.add decorator to skip not support os default pkg for pf and vf flexible suite

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/TestSuite_flexible_rxd.py             | 26 +++++++++++++-------------
 tests/TestSuite_iavf_flexible_descriptor.py | 21 +++++++++++++--------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/tests/TestSuite_flexible_rxd.py b/tests/TestSuite_flexible_rxd.py
index 648173e..45eb603 100644
--- a/tests/TestSuite_flexible_rxd.py
+++ b/tests/TestSuite_flexible_rxd.py
@@ -32,11 +32,12 @@
 
 
 import time
-from test_case import TestCase
+from test_case import TestCase, skip_unsupported_pkg, check_supported_nic
 from flexible_common import FlexibleRxdBase
 import rte_flow_common as rfc
 
 class TestFlexibleRxd(TestCase, FlexibleRxdBase):
+    supported_nic = ['columbiaville_100g', 'columbiaville_25g', 'columbiaville_25gx2', 'foxville']
 
     def preset_compilation(self):
         """
@@ -65,17 +66,11 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
         [self.dut.send_expect(cmd, "#", 15, alt_session=True) for cmd in cmds]
         self.dut.build_install_dpdk(self.dut.target)
 
+    @check_supported_nic(supported_nic)
     def set_up_all(self):
         """
         run at the start of each test suite.
         """
-        support_nics = [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "foxville",
-        ]
-        self.verify(self.nic in support_nics,
-            "flexible rxd only supports CVL NIC.")
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
         self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
@@ -85,17 +80,12 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
         self.pci = self.dut.ports_info[0]['pci']
         self.dst_mac = self.dut.get_mac_address(self.dut_ports[0])
         self.init_base(self.pci, self.dst_mac, 'pf')
-        self.ddp_dir = "/lib/firmware/updates/intel/ice/ddp/"
-        self.suite_config = rfc.get_suite_config(self)
-        self.os_default_pkg = self.suite_config["os_default_package_file_location"]
-        self.comms_pkg = self.suite_config["comms_package_file_location"]
 
     def tear_down_all(self):
         """
         Run after each test suite.
         """
         self.restore_compilation()
-        self.replace_pkg(pkg='comms')
 
     def set_up(self):
         """
@@ -111,60 +101,70 @@ class TestFlexibleRxd(TestCase, FlexibleRxdBase):
         time.sleep(2)
         self.dut.kill_all()
 
+    @skip_unsupported_pkg('os default')
     def test_check_single_VLAN_fields_in_RXD_8021Q(self):
         """
         Check single VLAN fields in RXD (802.1Q)
         """
         self.check_single_VLAN_fields_in_RXD_8021Q()
 
+    @skip_unsupported_pkg('os default')
     def test_check_double_VLAN_fields_in_RXD_8021Q_1_VLAN_tag(self):
         """
         Check double VLAN fields in RXD (802.1Q) only 1 VLAN tag
         """
         self.check_double_VLAN_fields_in_RXD_8021Q_1_VLAN_tag()
 
+    @skip_unsupported_pkg('os default')
     def test_check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag(self):
         """
         Check double VLAN fields in RXD (802.1Q) 2 VLAN tags
         """
         self.check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag()
 
+    @skip_unsupported_pkg('os default')
     def test_check_double_VLAN_fields_in_RXD_8021ad(self):
         """
         Check double VLAN fields in RXD (802.1ad)
         """
         self.check_double_VLAN_fields_in_RXD_8021ad()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv4_fields_in_RXD(self):
         """
         Check IPv4 fields in RXD
         """
         self.check_IPv4_fields_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv6_fields_in_RXD(self):
         """
         Check IPv6 fields in RXD
         """
         self.check_IPv6_fields_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv6_flow_field_in_RXD(self):
         """
         Check IPv6 flow field in RXD
         """
         self.check_IPv6_flow_field_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_TCP_fields_in_IPv4_in_RXD(self):
         """
         Check TCP fields in IPv4 in RXD
         """
         self.check_TCP_fields_in_IPv4_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_TCP_fields_in_IPv6_in_RXD(self):
         """
         Check TCP fields in IPv6 in RXD
         """
         self.check_TCP_fields_in_IPv6_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv4_IPv6_TCP_fields_in_RXD_on_specific_queues(self):
         """
         Check IPv4, IPv6, TCP fields in RXD on specific queues
diff --git a/tests/TestSuite_iavf_flexible_descriptor.py b/tests/TestSuite_iavf_flexible_descriptor.py
index 3bfd5b9..41d227a 100644
--- a/tests/TestSuite_iavf_flexible_descriptor.py
+++ b/tests/TestSuite_iavf_flexible_descriptor.py
@@ -35,11 +35,12 @@ import time
 import traceback
 
 
-from test_case import TestCase
+from test_case import TestCase, skip_unsupported_pkg, check_supported_nic
 from flexible_common import FlexibleRxdBase
 
 
 class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
+    supported_nic = ['columbiaville_100g', 'columbiaville_25g', 'columbiaville_25gx2', 'foxville']
 
     def preset_compilation(self):
         """
@@ -100,17 +101,11 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
         except Exception as e:
             self.logger.info(traceback.format_exc())
 
+    @check_supported_nic(supported_nic)
     def set_up_all(self):
         """
         run at the start of each test suite.
         """
-        support_nics = [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "foxville",
-        ]
-        self.verify(self.nic in support_nics,
-            "flexible rxd only supports CVL NIC.")
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
         self.preset_compilation()
@@ -139,18 +134,21 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
         time.sleep(2)
         self.dut.kill_all()
 
+    @skip_unsupported_pkg('os default')
     def test_check_single_VLAN_fields_in_RXD_8021Q(self):
         """
         Check single VLAN fields in RXD (802.1Q)
         """
         self.check_single_VLAN_fields_in_RXD_8021Q()
 
+    @skip_unsupported_pkg('os default')
     def test_check_single_VLAN_fields_in_RXD_8021ad(self):
         """
         Check single VLAN fields in RXD (802.1ad)
         """
         self.check_single_VLAN_fields_in_RXD_8021ad()
 
+    @skip_unsupported_pkg('os default')
     def test_check_double_VLAN_fields_in_RXD_8021Q_1_VLAN_tag(self):
         """
         Check double VLAN fields in RXD (802.1Q) only 1 VLAN tag
@@ -163,42 +161,49 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
         """
         self.check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag()
 
+    @skip_unsupported_pkg('os default')
     def test_check_double_VLAN_fields_in_RXD_8021ad(self):
         """
         Check double VLAN fields in RXD (802.1ad)
         """
         self.check_double_VLAN_fields_in_RXD_8021ad()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv4_fields_in_RXD(self):
         """
         Check IPv4 fields in RXD
         """
         self.check_IPv4_fields_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv6_fields_in_RXD(self):
         """
         Check IPv6 fields in RXD
         """
         self.check_IPv6_fields_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv6_flow_field_in_RXD(self):
         """
         Check IPv6 flow field in RXD
         """
         self.check_IPv6_flow_field_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_TCP_fields_in_IPv4_in_RXD(self):
         """
         Check TCP fields in IPv4 in RXD
         """
         self.check_TCP_fields_in_IPv4_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_TCP_fields_in_IPv6_in_RXD(self):
         """
         Check TCP fields in IPv6 in RXD
         """
         self.check_TCP_fields_in_IPv6_in_RXD()
 
+    @skip_unsupported_pkg('os default')
     def test_check_IPv4_IPv6_TCP_fields_in_RXD_on_specific_queues(self):
         """
         Check IPv4, IPv6, TCP fields in RXD on specific queues
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dts] [PATCH V1] tests/flexible: add decorator for pkg check
  2021-03-30  6:36 [dts] [PATCH V1] tests/flexible: add decorator for pkg check Zhimin Huang
@ 2021-03-30  6:51 ` Huang, ZhiminX
  2021-03-31  7:12   ` Tu, Lijuan
  0 siblings, 1 reply; 3+ messages in thread
From: Huang, ZhiminX @ 2021-03-30  6:51 UTC (permalink / raw)
  To: dts

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Tuesday, March 30, 2021 2:36 PM
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V1] tests/flexible: add decorator for pkg check
> 
Tested-by: Huang Zhimin <zhiminx.huang@intel.com> 

[-- Attachment #2: TestFlexibleRxd.log --]
[-- Type: application/octet-stream, Size: 965431 bytes --]

[-- Attachment #3: TestIavfFlexibleDescriptor.log --]
[-- Type: application/octet-stream, Size: 338905 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dts] [PATCH V1] tests/flexible: add decorator for pkg check
  2021-03-30  6:51 ` Huang, ZhiminX
@ 2021-03-31  7:12   ` Tu, Lijuan
  0 siblings, 0 replies; 3+ messages in thread
From: Tu, Lijuan @ 2021-03-31  7:12 UTC (permalink / raw)
  To: Huang, ZhiminX, dts



> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Huang, ZhiminX
> Sent: 2021年3月30日 14:52
> To: dts@dpdk.org
> Subject: Re: [dts] [PATCH V1] tests/flexible: add decorator for pkg check
> 
> > -----Original Message-----
> > From: Huang, ZhiminX <zhiminx.huang@intel.com>
> > Sent: Tuesday, March 30, 2021 2:36 PM
> > To: dts@dpdk.org
> > Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> > Subject: [dts] [PATCH V1] tests/flexible: add decorator for pkg check
> >
> Tested-by: Huang Zhimin <zhiminx.huang@intel.com>

Applied

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-31  7:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30  6:36 [dts] [PATCH V1] tests/flexible: add decorator for pkg check Zhimin Huang
2021-03-30  6:51 ` Huang, ZhiminX
2021-03-31  7:12   ` Tu, Lijuan

test suite reviews and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ https://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git