[decap] Remove orphaned --ttl_uniform / --dscp_uniform options#24627
Merged
Blueve merged 1 commit intoMay 15, 2026
Merged
Conversation
PR sonic-net#20304 refactored tests/decap/conftest.py. It removed pytest_generate_tests and build_ttl_dscp_params, and replaced them with the supported_ttl_dscp_params fixture which returns a single {ttl, dscp, vxlan} dict at runtime based on the DUT APP_DB / ASIC heuristics. That refactor left four CLI options registered in tests/decap/__init__.py with no consumer: --ttl_uniform --dscp_uniform --no_ttl_uniform --no_dscp_uniform The companion conditional_mark cleanup PR removes the parametrize-keyed entries that these options used to drive. The public sonic-mgmt repo has no remaining consumer of these CLI flags; a grep across origin/master and origin/202511 confirms zero references outside the addoption block itself. Removing the dead options keeps the test surface honest. The --outer_ipv4 / --outer_ipv6 / --inner_ipv4 / --inner_ipv6 options are still in use and remain. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Xichen Lin <lukelin0907@gmail.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Xichen96
added
Request for 202511 branch
Blueve
approved these changes
May 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
Remove the four orphaned pytest CLI options registered in
tests/decap/__init__.py:--ttl_uniform--dscp_uniform--no_ttl_uniform--no_dscp_uniformWhy
PR #20304 refactored
tests/decap/conftest.py. It removedpytest_generate_testsandbuild_ttl_dscp_params, and replaced them with thesupported_ttl_dscp_paramsfixture, which returns a single{ttl, dscp, vxlan}dict at runtime based on the DUT's APP_DB / ASIC heuristics. That refactor left the four--*_uniformoptions registered with no consumer.The companion conditional_mark cleanup PR (#24626) removes the parametrize-keyed entries these options used to drive. A grep across
origin/masterandorigin/202511confirms that no file in the public sonic-mgmt repo references--ttl_uniform,--dscp_uniform,--no_ttl_uniform, or--no_dscp_uniformoutside theaddoptionblock itself.Removing the dead options keeps the test surface honest. The
--outer_ipv4/--outer_ipv6/--inner_ipv4/--inner_ipv6options are still in use and remain.Approach
Pure deletion in
tests/decap/__init__.py— −25 lines, no additions.How to verify it
pytest --collect-only tests/decap/test_decap.pystill collects exactly one item (decap/test_decap.py::test_decap), identical to before. After this change, passing--no_dscp_uniformwill be rejected by pytest asunrecognized arguments, surfacing dead invocations rather than silently doing nothing.Related
Backports
Backports handled by automation after master merges.