Skip to content

[action] [PR:16118] Fix test_pfcwd_function on Mellanox platform#16678

Merged
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/16118
Jan 24, 2025
Merged

[action] [PR:16118] Fix test_pfcwd_function on Mellanox platform#16678
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/16118

Conversation

@mssonicbld
Copy link
Collaborator

Description of PR

Summary:
This PR is to fix test issue caused by PR #14711

The code below is to ensure there is PFCWD triggered on new queues before checking syslog.

pytest_assert(wait_until(PFC_STORM_TIMEOUT, 2, 0,
lambda: check_pfc_storm_state(dut, port, self.storm_hndle.pfc_queue_idx) != pfcwd_stats_before_test), # noqa: E501, E128
"PFC storm state did not change as expected") # noqa: E127

The test is flaky after change in 14711 because the wait time is not enough for PFCWD to be triggered on new queues.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405

Approach

What is the motivation for this PR?

This PR is to fix test issue caused by PR #15946

How did you do it?

Change the logic back while maintain compatibility with chassis.

How did you verify/test it?

The change is verified on a Mellanox platform.

collected 5 items 

pfcwd/test_pfcwd_function.py::TestPfcwdFunc::test_pfcwd_actions[str2-msn4600c-acs-04] ^H ^H ^H ^HPASSED [ 20%]
pfcwd/test_pfcwd_function.py::TestPfcwdFunc::test_pfcwd_multi_port[str2-msn4600c-acs-04] ^H ^H ^HPASSED [ 40%]
pfcwd/test_pfcwd_function.py::TestPfcwdFunc::test_pfcwd_mmu_change[str2-msn4600c-acs-04] ^H ^HPASSED [ 60%]
pfcwd/test_pfcwd_function.py::TestPfcwdFunc::test_pfcwd_port_toggle[str2-msn4600c-acs-04] ^H ^H ^HPASSED [ 80%]
pfcwd/test_pfcwd_function.py::TestPfcwdFunc::test_pfcwd_no_traffic[str2-msn4600c-acs-04] SKIPPED (This test is applicable only for cisco-8000 / Pfcwd tests skipped on m0/mx testbed.) [100%]

Any platform specific information?

Mellanox platform specific.

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

Not a new test.

Documentation

@mssonicbld
Copy link
Collaborator Author

/azp run

@mssonicbld
Copy link
Collaborator Author

Original PR: #16118

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit 80595c6 into sonic-net:202411 Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants