Skip to content

Update test_pg_headroom_update.py to use new function from gu_utils.py #13722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxin merged 3 commits into from
Jul 23, 2024
Merged

Update test_pg_headroom_update.py to use new function from gu_utils.py #13722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
badfe42
Move pg headroom update test to skip list
yutongzhang-microsoft Jul 19, 2024
e1be8ca
Add test_pg_headroom_update.py into T0 PR checker
yutongzhang-microsoft Jul 23, 2024
c1850c7
Merge branch 'master' into yutongzhang/skip_pg_headroom_update
yutongzhang-microsoft Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .azure-pipelines/pr_test_scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ onboarding_t0:
- clock/test_clock.py
- generic_config_updater/test_dynamic_acl.py
- generic_config_updater/test_pfcwd_status.py
- generic_config_updater/test_pg_headroom_update.py
- mvrf/test_mgmtvrf.py
- pc/test_lag_member.py
- pfcwd/test_pfc_config.py
Expand All @@ -333,6 +332,12 @@ onboarding_t0:
- test_pktgen.py
- arp/test_unknown_mac.py
- hash/test_generic_hash.py
- dualtor/test_orchagent_active_tor_downstream.py
- dualtor/test_orchagent_mac_move.py
- dualtor/test_orchagent_standby_tor_downstream.py
- dualtor/test_standby_tor_upstream_mux_toggle.py
Copy link
Contributor

@xwjiang-ms xwjiang-ms Jul 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

need to sync with latest master, these dualtor scripts were moved in to t0 job

Copy link
Contributor Author

@yutongzhang-microsoft yutongzhang-microsoft Jul 23, 2024

Choose a reason for hiding this comment

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

need to sync with latest master, these dualtor scripts were put in to t0 job

Sure

- generic_config_updater/test_pg_headroom_update.py


onboarding_t1:
- generic_config_updater/test_cacl.py
Expand Down
4 changes: 2 additions & 2 deletions tests/generic_config_updater/test_pg_headroom_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from tests.generic_config_updater.gu_utils import apply_patch, expect_op_success, expect_op_failure
from tests.generic_config_updater.gu_utils import generate_tmpfile, delete_tmpfile
from tests.generic_config_updater.gu_utils import create_checkpoint, delete_checkpoint, rollback_or_reload
from tests.generic_config_updater.gu_utils import is_valid_platform_and_version
from tests.generic_config_updater.gu_utils import is_valid_platform_and_version, get_asic_name

pytestmark = [
pytest.mark.topology('any'),
Expand Down Expand Up @@ -79,7 +79,7 @@ def _confirm_value_in_app_and_asic_db():

@pytest.mark.parametrize("operation", ["replace"])
def test_pg_headroom_update(duthost, ensure_dut_readiness, operation, skip_when_buffer_is_dynamic_model):
asic_type = duthost.get_asic_name()
asic_type = get_asic_name(duthost)
Copy link
Contributor

@opcoder0 opcoder0 Jul 23, 2024

Choose a reason for hiding this comment

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

sonic-cfggen -d -v DEVICE_METADATA.localhost.hwsku on vs seems to be recognized as Force10-S6000 which leads to td2. May be we can add a comment?

pytest_require("td2" not in asic_type, "PG headroom should be skipped on TD2")
tmpfile = generate_tmpfile(duthost)

Expand Down