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

[2019.2.1] Various fixes for 2019.2.1 to ensure tests pass on Mac OS X #53432

Merged
merged 17 commits into from Jun 21, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Jun 10, 2019

What does this PR do?

Various fixes for 2019.2.1 to ensure tests pass on Mac OS X

What issues does this PR fix or reference?

N/A

Tests written?

[NOTICE] Bug fixes or features added to Salt require tests.
Please review the test documentation for details on how to implement tests into Salt's test suite.
Yes. Fixes to existing tests.

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.

@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Jun 10, 2019
@weswhet

This comment has been minimized.

Copy link
Contributor

commented Jun 10, 2019

LGTM: Thanks for taking the time to give macOS a little TLC.

@dwoz
dwoz approved these changes Jun 10, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member

commented Jun 11, 2019

The http query test failures under py3 will be fixed by b1b1b26 in #53408

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:2019_2_1_mac_fixes branch from e779967 to 027b177 Jun 19, 2019
…to another location. This fix ensures that when fsroot is referenced we are using the real path and not the symlink path.
…ack_py3 on "OS X, need to ensure that salt.utils.thin.os.close is mocked.
…nds for the module we're checking.
…nged in Mojave, additional columns added.
…beacons/__init__.py we need to fire an event back to complete the loop and ensure that everything worked as expected.
…/bin/
…sistent.
…r state tests.
…_lazy_proxy_sum and

integration.states.test_pip_state.PipStateTest.test_22359_pip_installed_unless_does_not_trigger_warnings when running on OS X.
…l_state_with_long_tag
…ttps on OS X
…n is Python2.
@garethgreenaway garethgreenaway force-pushed the garethgreenaway:2019_2_1_mac_fixes branch from 027b177 to 7721151 Jun 20, 2019
…g on OS X and Py2.
@Ch3LL
Ch3LL approved these changes Jun 21, 2019
@Ch3LL Ch3LL merged commit c606952 into saltstack:2019.2.1 Jun 21, 2019
14 of 17 checks passed
14 of 17 checks passed
continuous-integration/jenkins/pr-head This commit cannot be built
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 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 Python lint test has passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 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-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.