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

Fix regression with top_file_merging_strategy=same #48165

Merged
merged 5 commits into from Jun 19, 2018

Conversation

Projects
None yet
2 participants
@terminalmage
Member

terminalmage commented Jun 16, 2018

The changes made in 7058f10 / 3df6fa7 were incorrect, the prior behavior was correct. This reverts those changes.

There were top file merging unit tests, but they only tested the merge functions themselves, they did not test the state compiler, and so they did not catch this regression since the breakage occured in the process of reading the top files (which happens before merging). Those tests have been replaced with ones that run state.show_top and thus do involve the state compiler.

terminalmage added some commits Jun 15, 2018

Revert 7058f10 / 3df6fa7
The previous behavior was expected, this change should not have been
made.
Remove redundant top file merging tests
These were intrinsically flawed since they only tested the merge
functions themselves, and not the rest of the state compiler. They have
been replaced by the tests in unit.modules.test_state.TopFileMergingCase.

@rallytime rallytime merged commit 71e3855 into saltstack:2018.3 Jun 19, 2018

6 of 9 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5778 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19832 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25981 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18036 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23708 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10749 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22671 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:issue48144 branch Jun 21, 2018

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