Skip to content

Revert "[action] [PR:18699] fix: correct DUT variable name in startup tsa pretest (#344)"#359

Merged
yejianquan merged 1 commit intoAzure:202405from
cyw233:revert-pretest-dut-variable
Jun 4, 2025
Merged

Revert "[action] [PR:18699] fix: correct DUT variable name in startup tsa pretest (#344)"#359
yejianquan merged 1 commit intoAzure:202405from
cyw233:revert-pretest-dut-variable

Conversation

@cyw233
Copy link

@cyw233 cyw233 commented Jun 4, 2025

This reverts commit 7551587.

I thought we cherry picked the multithreading run of pretest PR (sonic-net/sonic-mgmt#17493) into msft.202405 but we never did, so the PR sonic-net/sonic-mgmt#18699 should never be cherry picked into msft.202405 as it's only a fix when test_pretest.py runs with multithreading.

In msft.202405 branch, we are running test_pretest.py (e.g. test_disable_startup_tsa_tsb_service()) in a normal for loop: https://github.com/Azure/sonic-mgmt.msft/blob/202405/tests/test_pretest.py#L385, so we should use duthost instead of dut

Copy link

@yejianquan yejianquan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yejianquan yejianquan merged commit 367f007 into Azure:202405 Jun 4, 2025
3 checks passed
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.

2 participants