Skip to content

Update test_duplicate_route to fix PR test failures#20360

Closed
Ndancejic wants to merge 1 commit intosonic-net:masterfrom
Ndancejic:unblock_pr
Closed

Update test_duplicate_route to fix PR test failures#20360
Ndancejic wants to merge 1 commit intosonic-net:masterfrom
Ndancejic:unblock_pr

Conversation

@Ndancejic
Copy link
Contributor

Description of PR

test_duplicate_route is failing PR tests in sairedis submodule update for sonic-buildimge. This is due to a sairedis change which updates bulk operation functionality to match the expected behavior when SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR flag is set.

sonic-buildimage PR: sonic-net/sonic-buildimage#23334
sonic-sairedis PR: sonic-net/sonic-sairedis#1613

This sairedis change causes swss to process failures in a different way, which leads to a change in expected log output. test_duplicate_route will look for logs output before the change sairedis#1613 causing failure, and changing test_duplicate_route to expect logs after sairedis#1613 fails other PR.

This change looks to temporarily loosen the expected log output so that both versions of sairedis can pass this test. Once buildimage#23334 is merged, the expected logs can be updated to match only the new behavior.

Summary:
Fixes #20231

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505

Approach

What is the motivation for this PR?

Unblock sairedis module update in sonic-buildimage sonic-net/sonic-buildimage#23334

How did you do it?

  • Reduce expected logs to those that will be output in both cases
  • add ignore logs to prevent failure

How did you verify/test it?

Run on testbed

Any platform specific information?

N/A

Supported testbed topology if it's a new test case?

N/A

test_duplicate_route is failing PR tests in sairedis submodule update
for sonic-buildimge. This is due to a sairedis change which updates bulk
operation functionality to match the expected behavior when
SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR flag is set.

sonic-buildimage PR: sonic-net/sonic-buildimage sonic-net#23334
sonic-sairedis PR: sonic-net/sonic-sairedis sonic-net#1613

This sairedis change causes swss to process failures in a different way,
which leads to a change in expected log output. test_duplicate_route
will look for logs output before the change sonic-net#1613 causing failure, and changing
test_duplicate_route to expect logs after sonic-net#1613 fails other PR.

This change looks to temporarily loosen the expected log output so that
both versions of sairedis can pass this test. Once sonic-net#23334 is merged, the
expected logs can be updated to match only the new behavior.

Signed-off-by: Nikola Dancejic <ndancejic@microsoft.com>
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Ndancejic Ndancejic closed this Aug 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Regression: test_duplicate_route.py failing log checks after sairedis update

2 participants