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

[2019.2.1] More nox changes and test fixes #52952

Merged

Conversation

@s0undt3ch
Copy link
Member

commented May 9, 2019

What does this PR do?

See title.

@s0undt3ch s0undt3ch requested a review from saltstack/team-core as a code owner May 9, 2019
dwoz and others added 15 commits Apr 29, 2019
```
06:10:57        RuntimeError: dictionary changed size during iteration
06:10:57        Traceback (most recent call last):
06:10:57          File "/usr/lib64/python2.7/multiprocessing/queues.py", line 266, in _feed
06:10:57            send(obj)
06:10:57        RuntimeError: dictionary changed size during iteration
```
This prevents a deprecation warning due to the "encoding" argument being
deprecated in version 0.5.2.

Conflicts:
* salt/payload.py
No globally changing the environment on import, please.
No top level `__init__.py` should contain tests
@s0undt3ch s0undt3ch force-pushed the s0undt3ch:merge-forward/2018.3-to-2019.2.1-cherry branch from 9aa429d to 12a9408 May 9, 2019
@s0undt3ch s0undt3ch changed the title Fix `GOLDEN_IMAGES_CI_BRANCH` value [2019.2.1] More nox changes and test fixes May 9, 2019
s0undt3ch added 4 commits May 9, 2019
This reverts commit 99f9e1c.
@s0undt3ch s0undt3ch merged commit 9b290b6 into saltstack:2019.2.1 May 9, 2019
17 checks passed
17 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 Python lint test has passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.