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 `unit.beacons.test_diskusage` on Windows #50282

Merged
merged 1 commit into from Oct 29, 2018

Conversation

Projects
None yet
3 participants
@twangboy
Copy link
Contributor

commented Oct 29, 2018

What does this PR do?

Some of the linux tests were failing because is_windows was not being mocked. This mocks is_windows to False so that the correct comparisons are made.

Tests written?

Yes

Commits signed with GPG?

Yes

@twangboy twangboy requested a review from garethgreenaway Oct 29, 2018

@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Oct 29, 2018

@twangboy lint issues.

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Oct 29, 2018

Those don't look related to me. I think something got a little mixed up in the runtest.py work that went in recently (see #50182). I think this is OK to go in. I will fix anything that pops up in case I am overlooking something.

@rallytime rallytime merged commit 0f1dc08 into saltstack:2018.3 Oct 29, 2018

9 of 10 checks passed

jenkins/pr/lint The lint job has failed
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@twangboy twangboy deleted the twangboy:fix_test_diskusage branch Oct 29, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.