Skip to content

fix: correct DUT variable name in startup tsa pretest#18699

Merged
yejianquan merged 1 commit intosonic-net:masterfrom
cyw233:fix-disable-startup-tsa-pretest
May 30, 2025
Merged

fix: correct DUT variable name in startup tsa pretest#18699
yejianquan merged 1 commit intosonic-net:masterfrom
cyw233:fix-disable-startup-tsa-pretest

Conversation

@cyw233
Copy link
Contributor

@cyw233 cyw233 commented May 29, 2025

Description of PR

Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in #17247

Summary:
Fixes # (issue)

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?

When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.

How did you do it?

How did you verify/test it?

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Javier-Tan
Copy link
Contributor

LGTM

@yejianquan yejianquan merged commit f859718 into sonic-net:master May 30, 2025
20 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request May 30, 2025
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202505: #18711

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#344

mssonicbld pushed a commit that referenced this pull request May 30, 2025
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in #17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.
bachalla pushed a commit to bachalla/sonic-mgmt that referenced this pull request Jun 2, 2025
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.
@vkjammala-arista
Copy link
Contributor

I see this PR is merged into msft-202405 which is not applicable there and caused test_pretest.py breakage. Can we please revert this from msft-202405 branch @cyw233 @yejianquan

@cyw233
Copy link
Contributor Author

cyw233 commented Jun 4, 2025

I see this PR is merged into msft-202405 which is not applicable there and caused test_pretest.py breakage. Can we please revert this from msft-202405 branch @cyw233 @yejianquan

Will fix asap

@cyw233
Copy link
Contributor Author

cyw233 commented Jun 4, 2025

I see this PR is merged into msft-202405 which is not applicable there and caused test_pretest.py breakage. Can we please revert this from msft-202405 branch @cyw233 @yejianquan

Revert PR: Azure/sonic-mgmt.msft#359

yejianquan added a commit to Azure/sonic-mgmt.msft that referenced this pull request Jun 4, 2025
… tsa pretest (#344)" (#359)

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
@cyw233
Copy link
Contributor Author

cyw233 commented Jun 4, 2025

@vkjammala-arista Revert PR merged, sorry for the confusion and inconvenience. Thanks @yejianquan for merging!

@vkjammala-arista
Copy link
Contributor

vkjammala-arista commented Jun 4, 2025

@vkjammala-arista Revert PR merged, sorry for the confusion and inconvenience. Thanks @yejianquan for merging!

Thanks @cyw233 for the very quick resolution.

opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.

Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.

Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
Description of PR
Fix the dut variable name in test_disable_startup_tsa_tsb_service() in test_pretest.py added in sonic-net#17247

Summary:
Fixes # (issue)

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?
When using multithreading parallel run, we cannot refer to the duthost variable, we need to use dut instead.

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
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.

5 participants