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 #48898

merged 19 commits into from Aug 5, 2018


None yet
4 participants

rallytime commented Aug 2, 2018


  • tests/integration/modules/
  • tests/integration/netapi/rest_tornado/

rallytime and others added some commits Aug 1, 2018

Skip unreliable tornado test.
Even with the flaky decorator, it still fails _sometimes_. This is not
a useful test as it sits. Skipping it for now.
Fix race when SIGTERM/SIGINT received while lazyloading a module
This try/except block is designed to keep some bozo from putting a
sys.exit() in their code and causing the minion to stop. The stack from
the exception is inspected, and if our signal handling ran the
sys.exit() then we re-run that sys.exit().
Merge pull request #48867 from rallytime/skip-tornado-test
Skip unreliable tornado test.
Merge pull request #48869 from Ch3LL/mac_shell_tests
Catch socket.error exception in testprogram
Fix failing git worktree tests
Git 2.18.0 changed the output format against which some of the asserts
in this test are performed. Instead of displaying the full path to the
worktree, it now references the branch name instead. This test updates
the asserts to look for the basename instead, which should allow it to
pass on Git releases both before and after 2.18.0.
Separate compound matcher tests into individual tests
When one match fails (and some of these can be flaky) the whole test fails.

This makes it somewhat difficult to track down why the test fails.

I am hoping we won't need the sleeps in this change when the tests are separate,
but let's see how that goes. It worked fine in my testing.

I also updated the test to use pytest notation, rather than unittest.
Mark shadow module integration test as flaky
This test fails sometimes, so let's mark it as flaky.

I have tried to reproduce the failure and fix it, but to no avail.

Let's mark it as flaky for now.
Merge pull request #48868 from terminalmage/fix-loader-race
Fix race when SIGTERM/SIGINT received while lazyloading a module
Merge pull request #48884 from rallytime/flaky-tests-matchers
Separate compound matcher tests into individual tests
Merge pull request #48885 from rallytime/flaky-tests-shadow
Mark shadow module integration test as flaky
Merge pull request #48890 from Ch3LL/cmd_test
add sleep in test_cmd integration test
Merge branch '2017.7' into '2018.3'
  - tests/integration/modules/
  - tests/integration/netapi/rest_tornado/

@rallytime rallytime requested a review from saltstack/team-core as a code owner Aug 2, 2018

@rallytime rallytime merged commit ffa1fcc into saltstack:2018.3 Aug 5, 2018

5 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
WIP ready for review
jenkins/pr/docs The docs job has passed
jenkins/pr/lint The lint job has passed
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Aug 5, 2018

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