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 2018.3.3 to 2018.3 #49511

Merged
merged 44 commits into from Sep 5, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Copy link
Contributor

commented Sep 5, 2018

Conflicts:

  • tests/integration/states/test_file.py
  • tests/support/helpers.py
  • tests/whitelist.txt

gtmanfred and others added some commits Aug 22, 2018

file state test fixes
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
Work around cmd.run unicode issues in test for now
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
Test fixes
- Fix tearDown method to remove unicode environment key.
- Mark flaky test as such, test_set_system_time fails when run at
  certian times of the day.
Merge pull request #49442 from rallytime/bp-49180
Back-port #49180 and related fixes to 2018.3.3
Merge pull request #49449 from rallytime/flaky-test
Mark status test as flaky

gtmanfred and others added some commits Aug 30, 2018

Re-factor dedent to fix warts
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
Pin CherryPy version to < 18.0.0 in requirements files for PY2
Version 18.0 now requires Python 3.5, so we need to pin this for Py2.
Merge pull request #49499 from rallytime/pin-cherrypy-2018.3.3
Pin CherryPy version to < 18.0.0 in requirements files for PY2
Merge branch '2018.3.3' into '2018.3'
Conflicts:
  - tests/integration/states/test_file.py
  - tests/support/helpers.py
  - tests/whitelist.txt

@rallytime rallytime requested a review from saltstack/team-core Sep 5, 2018

@rallytime rallytime merged commit f73f2e5 into saltstack:2018.3 Sep 5, 2018

6 of 10 checks passed

jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
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

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Sep 5, 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.