Skip to content

[m0] Optimize test_mark_conditions for m0-2vlan topo #8721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaqiangz merged 1 commit into from
Jun 26, 2023
Merged

[m0] Optimize test_mark_conditions for m0-2vlan topo #8721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ crm/test_crm.py::test_crm_fdb_entry:
skip:
reason: "Unsupported topology, expected to run only on 'T0*' or 'M0/MX' topology"
conditions:
- "'t0' not in topo_name and topo_name not in ['m0', 'mx']"
- "'t0' not in topo_name and topo_type not in ['m0', 'mx']"

#######################################
##### decap #####
Expand Down Expand Up @@ -237,7 +237,7 @@ drop_packets:
skip:
reason: "M0/MX topo does not support drop_packets"
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

#######################################
##### dualtor #####
Expand Down Expand Up @@ -531,13 +531,13 @@ iface_namingmode/test_iface_namingmode.py::TestShowPriorityGroup:
skip:
reason: "M0/MX topo does not support TestShowPriorityGroup"
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

iface_namingmode/test_iface_namingmode.py::TestShowQueue:
skip:
reason: "M0/MX topo does not support TestShowQueue"
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

iface_namingmode/test_iface_namingmode.py::TestShowQueue::test_show_queue_persistent_watermark:
xfail:
Expand Down Expand Up @@ -632,7 +632,7 @@ mvrf:
skip:
reason: "M0/MX topo does not support mvrf"
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

#######################################
##### nat #####
Expand Down Expand Up @@ -723,7 +723,7 @@ pfcwd:
skip:
reason: "Pfcwd tests skipped on m0/mx testbed."
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

pfcwd/test_pfc_config.py::TestPfcConfig::test_forward_action_cfg:
skip:
Expand Down Expand Up @@ -788,7 +788,7 @@ qos:
skip:
reason: "M0/MX topo does not support qos"
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

qos/test_buffer.py:
skip:
Expand Down Expand Up @@ -979,13 +979,13 @@ snmp/test_snmp_pfc_counters.py:
skip:
reason: "M0/MX topo does not support test_snmp_pfc_counters"
conditions:
- "topo_name in ['m0', 'mx']"
- "topo_type in ['m0', 'mx']"

snmp/test_snmp_queue.py:
skip:
reason: "Interfaces not present on supervisor node or M0/MX topo does not support test_snmp_queue or unsupported platform"
conditions:
- "topo_name in ['m0', 'mx'] or asic_type in ['barefoot']"
- "topo_type in ['m0', 'mx'] or asic_type in ['barefoot']"

#######################################
##### span #####
Expand Down