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] Merge forward from 2017.7 to 2018.3 #49710

Merged
merged 5 commits into from Sep 19, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Sep 19, 2018

No conflicts.

KaiSforza and others added some commits Sep 17, 2018

Order the runtests suites
Uses an ordered dictionary instead of a default python dict when
describing the `TEST_SUITES` variable. Sorts alphabetically based on the
name of the suite.
Removing mocking of os.path.join from two tests, one of which was fai…
…ling when used with coverage argument. No reason we should be mocking os.path.join.
Merge pull request #49706 from garethgreenaway/1120_remove_mock_os_pa…
…th_join

[2017.7] Removing os.path.join mocking from tests.

@rallytime rallytime merged commit 936cae5 into saltstack:2018.3 Sep 19, 2018

7 of 10 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
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-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:merge-2018.3 branch Sep 19, 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.