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

Back-port #46291 to 2018.3 #48503

Merged
merged 22 commits into from Jul 13, 2018

Conversation

Projects
None yet
5 participants
@rallytime
Contributor

rallytime commented Jul 10, 2018

Back-port #46291 to 2018.3

Refs #48380 and #48110

JerzyX Drozdz and others added some commits Mar 1, 2018

@rallytime rallytime requested review from terminalmage and twangboy Jul 10, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-windows Jul 10, 2018

@cachedout

This comment has been minimized.

Contributor

cachedout commented Jul 10, 2018

@rallytime Test suite not loving this.

rallytime added some commits Jun 27, 2018

Handle list of lines instead of strings in file.line func
In `Fluorine`, in order to better handle line endings, the "body" variable
has been changed to a list of strings. Therefore, we need to handle encoding
or decoding the elements in the list, rather than using the `stringutils`
functions.
Add 'name' as the passed in filepath for test_line_insert_ensure_befo…
…re_first_line test

With 'foo', the test fails with an unknown file KeyError - we need to use the "name"
variable instead.

Fixes the test_line_insert_ensure_before_first_line test.
Update file unit tests to handle "writelines" change
Since file.line is now using "writelines()" instead of "write()", we
need to handle the unittests accordingly.
Remove /sr.* pattern from test
/sr.* pattern should raise exception
@rallytime

This comment has been minimized.

Contributor

rallytime commented Jul 12, 2018

OK, so when PR #48156 was added to the 2018.3 branch, and then merged forward to develop, those same tests were failing in the merge-forward in PR #48300.

In order for #48156 and #46291 to work together and to maintain the fixes for each PR, I had to make some additional changes. I have cherry-picked those changes that I made in #48300 here so that the backport will play nicely with the fixes in #48156. The tests should be much happier now.

@rallytime rallytime merged commit ee257a1 into saltstack:2018.3 Jul 13, 2018

11 of 16 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24331 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11373 — FAILURE
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26618 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18648 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6403 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23284 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20456 — SUCCESS
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-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:bp-46291 branch Jul 13, 2018

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