Skip to content

Enhance PTF function at scale testbed #913

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
r12f merged 1 commit into from
Jan 23, 2026
Merged

Enhance PTF function at scale testbed #913

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion tests/acl/null_route/test_null_route_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

from tests.common.fixtures.ptfhost_utils import remove_ip_addresses # noqa F401
import ptf.testutils as testutils
from tests.common.helpers.constants import PTF_TIMEOUT
from tests.common.helpers.assertions import pytest_require
from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer, LogAnalyzerError
from tests.common.utilities import get_upstream_neigh_type, get_neighbor_ptf_port_list, \
Expand Down Expand Up @@ -242,7 +243,7 @@ def send_and_verify_packet(ptfadapter, pkt, exp_pkt, tx_port, rx_port, expected_
ptfadapter.dataplane.flush()
testutils.send(ptfadapter, pkt=pkt, port_id=tx_port)
if expected_action == FORWARD:
testutils.verify_packet(ptfadapter, pkt=exp_pkt, port_id=rx_port, timeout=5)
testutils.verify_packet(ptfadapter, pkt=exp_pkt, port_id=rx_port, timeout=PTF_TIMEOUT)
else:
testutils.verify_no_packet(ptfadapter, pkt=exp_pkt, port_id=rx_port, timeout=5)

Expand Down
3 changes: 2 additions & 1 deletion tests/arp/test_arp_extended.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import pytest

from tests.arp.arp_utils import clear_dut_arp_cache
from tests.common.helpers.constants import PTF_TIMEOUT
from tests.common.utilities import increment_ipv4_addr
from tests.common.helpers.assertions import pytest_assert, pytest_require

Expand Down Expand Up @@ -101,4 +102,4 @@ def test_proxy_arp(rand_selected_dut, proxy_arp_enabled, ip_and_intf_info, ptfad
if ip_version == 'v6':
neigh_table = rand_selected_dut.shell('ip -6 neigh')['stdout']
logger.debug(neigh_table)
testutils.verify_packet(ptfadapter, expected_packet, ptf_intf_index, timeout=10)
testutils.verify_packet(ptfadapter, expected_packet, ptf_intf_index, timeout=PTF_TIMEOUT)
1 change: 1 addition & 0 deletions tests/common/helpers/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
RANDOM_SEED = 'random_seed'
CUSTOM_MSG_PREFIX = "sonic_custom_msg"
DUT_CHECK_NAMESPACE = "dut_check_result"
PTF_TIMEOUT = 60

# Describe upstream neighbor of dut in different topos
UPSTREAM_NEIGHBOR_MAP = {
Expand Down
3 changes: 2 additions & 1 deletion tests/span/span_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
'''

import ptf.testutils as testutils
from tests.common.helpers.constants import PTF_TIMEOUT


def send_and_verify_mirrored_packet(ptfadapter, src_port, monitor):
Expand All @@ -20,4 +21,4 @@ def send_and_verify_mirrored_packet(ptfadapter, src_port, monitor):

ptfadapter.dataplane.flush()
testutils.send(ptfadapter, src_port, pkt)
testutils.verify_packet(ptfadapter, pkt, monitor)
testutils.verify_packet(ptfadapter, pkt, monitor, timeout=PTF_TIMEOUT)