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

Back-port #50228 and #50443 to 2018.3 #50492

Merged
merged 13 commits into from Nov 13, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Nov 13, 2018

Back-port #50228 and #50443 to 2018.3

sheagcraig and others added some commits Oct 25, 2018

Fix trailing-slash bug in User LaunchAgent appending.
I discovered this issue while updating the tests, so there's no open
issue for it.
Update testing for mac_utils services.
This commit begins to go over the existing testing for mac_utils,
applying the updated best-practices from the unit testing section of the
Salt docs.

Wherever possible, I've tried to keep the data for each test within the
test, while factoring out repetitive functions. In this commit, for
example, the `os.walk` side_effect func has been factored into its own
helper function.

This commit begins looking at what is being tested for this module and
making it more specific, specifically to test one thing per test
(existing tests had multiple asserts and in some casaes were actually
malformed such that the tests would pass, but in actual use, code would
throw an exception and skip over the block).
@terminalmage
Copy link
Contributor

left a comment

@rallytime I know you didn't introduce these new log messages, but if you can fix them here in 2018.3 then the fixes will propagate forward on merge.

Show resolved Hide resolved salt/utils/mac_utils.py Outdated
Show resolved Hide resolved salt/utils/mac_utils.py Outdated
@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Nov 13, 2018

@terminalmage Good eye! I have fixed those logging formats.

@rallytime rallytime merged commit 6b272c1 into saltstack:2018.3 Nov 13, 2018

8 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 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/lint The lint 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/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:bp-50228-and-50443 branch Nov 13, 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.