diff --git a/tests/packet_trimming/base_packet_trimming.py b/tests/packet_trimming/base_packet_trimming.py index b07f7330121..c73e3476d59 100644 --- a/tests/packet_trimming/base_packet_trimming.py +++ b/tests/packet_trimming/base_packet_trimming.py @@ -402,7 +402,11 @@ def test_trimming_counters(self, duthost, ptfadapter, test_params, trim_counter_ # Trigger trimmed packets on queue6 counter_kwargs = self.get_verify_trimmed_counter_packet_kwargs(duthost, ptfadapter, {**trim_counter_params}) - counter_kwargs.update({'expect_packets': False}) + # TH5 cannot completely block egress queues, so trimmed packets will leak out of the trim queues. + if duthost.get_asic_name() == "th5": + counter_kwargs.update({'expect_packets': "skip"}) + else: + counter_kwargs.update({'expect_packets': False}) verify_trimmed_packet(**counter_kwargs) # Get the TrimDrop counters on port level diff --git a/tests/packet_trimming/packet_trimming_helper.py b/tests/packet_trimming/packet_trimming_helper.py index f799805da9d..0e4c4cc0795 100644 --- a/tests/packet_trimming/packet_trimming_helper.py +++ b/tests/packet_trimming/packet_trimming_helper.py @@ -916,7 +916,7 @@ def verify_packet_trimming(duthost, ptfadapter, ingress_port, egress_port, block verify_ports = [egress_port['ptf_id']] # Verify packet based on expectation - if expect_packets: + if expect_packets is True: logger.info( f"Expecting packets on ports {verify_ports} with size {recv_pkt_size} and DSCP {recv_pkt_dscp}") _, matched = testutils.verify_packet_any_port( @@ -929,7 +929,7 @@ def verify_packet_trimming(duthost, ptfadapter, ingress_port, egress_port, block logger.info( f"Successfully verified {packet_type} packet trimming with size {recv_pkt_size} " f"and DSCP {recv_pkt_dscp}") - else: + elif expect_packets is False: logger.info(f"Expecting NO packets on any of ports {verify_ports}") testutils.verify_no_packet_any( ptfadapter, @@ -938,6 +938,8 @@ def verify_packet_trimming(duthost, ptfadapter, ingress_port, egress_port, block timeout=timeout ) logger.info(f"Successfully verified NO {packet_type} packets were received as expected") + else: + logger.info(f"Skip capturing packets on ports {verify_ports}.") return True