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

[2018.3] fixes to diskusage beacon #50188

Merged

Conversation

Projects
None yet
4 participants
@garethgreenaway
Copy link
Member

commented Oct 24, 2018

What does this PR do?

Fixing a bug in the diskusage beacon that prevented it from working on Windows. Adding a couple tests to test functionality on Windows.

What issues does this PR fix or reference?

#49965

Previous Behavior

Diskusage beacon previously does not work under Windows because the mount (drive) that is based in the configuration is being interrupted as a pattern by the re library, so the result from psutil.disk_partitions does not match.

New Behavior

In the event that the diskusage beacon is running on Windows, ensure that the necessary pattern is escaped so the interrupted result will match what is returned from psutil.

Tests written?

Yes

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Fixing a bug in the diskusage beacon that prevented it from working o…
…n Windows. Adding a couple tests to test functionality on Windows.
@dwoz

dwoz approved these changes Oct 24, 2018

@rallytime rallytime merged commit 01b083e into saltstack:2018.3 Oct 25, 2018

4 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
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.