Skip to content
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.

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

Fix Windows tests in test_system #53735

Merged
merged 5 commits into from Jul 26, 2019

Conversation

@twangboy
Copy link
Contributor

commented Jul 6, 2019

What does this PR do?

Try to account for the fact that the system time may be obtained just as the clock increments minutes
Make sure the w32time service is stopped by wrapping it in some asserts and checking the status of the service after stopping
Put the service.stop inside the try/finally block so that it will be restarted after if something fails

Skips tests that set date/time for now

What issues does this PR fix or reference?

This has been failing in PR tests

Tests written?

Yes

Commits signed with GPG?

Yes

Try to account for the fact that the system time may be obtained just as
the clock increments minutes
Make sure the w32time service is stopped by wrapping it in some asserts
and checking the status of the service after stopping
Put the service.stop inside the try/finally block so that it will be
restarted after if something fails
@twangboy twangboy changed the title Fix some tests in the Windows Class Fix Windows tests in test_system Jul 6, 2019
twangboy added 3 commits Jul 8, 2019
twangboy added a commit to twangboy/salt that referenced this pull request Jul 24, 2019
dwoz added a commit that referenced this pull request Jul 25, 2019
Bring changes from 2019.2.1 PR #53735
@dwoz
dwoz approved these changes Jul 26, 2019
@felippeb felippeb self-requested a review Jul 26, 2019
@Akm0d
Akm0d approved these changes Jul 26, 2019
@dwoz dwoz merged commit 3cedacd into saltstack:2019.2.1 Jul 26, 2019
22 of 24 checks passed
22 of 24 checks passed
ci/py2/ubuntu1604/tcp This commit cannot be built
Details
ci/py3/windows2016 This commit is being built
Details
WIP Ready for review
Details
ci/docs This commit looks good
Details
ci/lint This commit looks good
Details
ci/py2/amazon2 This commit looks good
Details
ci/py2/centos6 This commit looks good
Details
ci/py2/centos7 This commit looks good
Details
ci/py2/centos7/tcp This commit looks good
Details
ci/py2/debian8 This commit looks good
Details
ci/py2/debian9 This commit looks good
Details
ci/py2/fedora29 This commit looks good
Details
ci/py2/ubuntu1604 This commit looks good
Details
ci/py2/ubuntu1804 This commit looks good
Details
ci/py2/windows2016 This commit looks good
Details
ci/py3/amazon2 This commit looks good
Details
ci/py3/centos7 This commit looks good
Details
ci/py3/centos7/tcp This commit looks good
Details
ci/py3/debian8 This commit looks good
Details
ci/py3/debian9 This commit looks good
Details
ci/py3/fedora29 This commit looks good
Details
ci/py3/ubuntu1604 This commit looks good
Details
ci/py3/ubuntu1604/tcp This commit looks good
Details
ci/py3/ubuntu1804 This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.