Skip to content

Fix: Fix NTP config long jump test failure issue #13671

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
rlhui merged 3 commits into from
Jul 17, 2024
Merged

Fix: Fix NTP config long jump test failure issue #13671

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
a4b58ed
Fix: Fix NTP config long jump test failure issue
wumiaont Jul 15, 2024
8e92fe2
Fix for long jump disabled test
wumiaont Jul 16, 2024
212094c
Merge branch 'master' into ntp
wumiaont Jul 16, 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: 0 additions & 7 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,13 +921,6 @@ ntp/test_ntp.py::test_ntp:
conditions:
- https://github.com/sonic-net/sonic-buildimage/issues/19425

ntp/test_ntp.py::test_ntp_long_jump_disabled:
# Due to NTP code bug, long jump will still happen after disable it.
# Set xfail flag for this test case
xfail:
strict: True
reason: "Known NTP bug"

#######################################
##### pc #####
#######################################
Expand Down
8 changes: 4 additions & 4 deletions tests/ntp/test_ntp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def config_long_jump(duthost, enable=False):
regex = "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/"

if using_ntpsec:
duthost.command("sed -i '%s' /etc/default/ntpsec" % regex)
duthost.command("sudo sed -i '%s' /etc/default/ntpsec" % regex)
else:
duthost.command("sed -i %s /etc/default/ntp" % regex)
duthost.command("sudo sed -i %s /etc/default/ntp" % regex)
duthost.service(name='ntp', state='restarted')


Expand Down Expand Up @@ -146,8 +146,8 @@ def test_ntp_long_jump_disabled(duthosts, rand_one_dut_hostname, setup_ntp, setu

config_long_jump(duthost, enable=False)

if wait_until(720, 10, 0, check_ntp_status, duthost):
pytest.fail("NTP long jump disable failed")
pytest_assert(wait_until(720, 10, 0, check_ntp_status, duthost),
"NTP long jump disable failed")


def run_ntp(duthosts, rand_one_dut_hostname, setup_ntp):
Expand Down