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

[2017.7] Merge forward from 2017.7.8 to 2017.7 #49021

Merged
merged 10 commits into from Aug 9, 2018

Conversation

Projects
None yet
1 participant
@rallytime
Contributor

rallytime commented Aug 8, 2018

No conflicts.

rallytime added some commits Aug 8, 2018

Update expected return value in boto test
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
Skip test_jinja_deep_error on Debian 8
This is a flaky test on Debian 8, so let's skip it for now.
Merge pull request #48999 from rallytime/fix-boto-test
Update expected return value in boto test
Make grains integration test more robust
The `test_grains_append_val_already_present` test can be flaky, especially on
CentOS 7 when it gets bogged down. Let's give the test a little breathing room
by adding a sleep so the grains.append calls don't stack up too quickly.
Merge pull request #49002 from rallytime/skip-jinja-deep-error-test
Skip test_jinja_deep_error on Debian 8
Merge pull request #49020 from rallytime/fix-grains-test
Make grains integration test more robust
Fix test error in test_compiler jinja check
The fix in #49002 was incomplete and when run on Debian, it hits a
`ValueError` when the RELEASE variable is a string with a decimal.
This change fixes the error.
Merge pull request #49024 from rallytime/fix-deb-test
Fix test error in test_compiler jinja check

@rallytime rallytime merged commit c06a3cf into saltstack:2017.7 Aug 9, 2018

8 checks passed

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:merge-2017.7 branch Aug 9, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment