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] Fixes to test_pip state sls files #52787

Merged

Conversation

@garethgreenaway
Copy link
Member

commented May 1, 2019

What does this PR do?

Adding an jinja if statement to only the python parameter if the result from get_python_executable is a valid value. Maintaining backwards compatibilty to run tests without Nox.

What issues does this PR fix or reference?

N/A

Tests written?

No. Fixing existing tests.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

…lt from get_python_executable is a valid value. Maintaining backwards compatibilty to run tests without Nox.
@garethgreenaway garethgreenaway requested review from s0undt3ch and saltstack/team-core May 1, 2019
@dwoz

This comment has been minimized.

Copy link
Contributor

commented May 1, 2019

I want to run the full suite on this before merging.

@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented May 2, 2019

re-run full all

@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented May 2, 2019

re-run ubuntu1804-py3

@dwoz

This comment has been minimized.

Copy link
Contributor

commented May 3, 2019

re-run ubuntu1804-py3

…lt from get_python_executable is a valid value. Maintaining backwards compatibilty to run tests without Nox.
… or greater. Removing the test that simulates versions of pip below 1.0.
…enaway/salt into fixes_test_pip_state_sls_files
…st on OS X because it hangs the test suite.
@saltstack saltstack deleted a comment from codecov bot May 9, 2019
@saltstack saltstack deleted a comment from codecov bot May 9, 2019
s0undt3ch and others added 3 commits May 9, 2019
…enaway/salt into fixes_test_pip_state_sls_files
@dwoz

This comment has been minimized.

Copy link
Contributor

commented May 10, 2019

re-run all

@garethgreenaway garethgreenaway changed the title [2018.3] Fixes to test_pip state sls files [WIP][2018.3] Fixes to test_pip state sls files May 10, 2019
@saltstack saltstack deleted a comment from codecov bot May 10, 2019
@codecov

This comment has been minimized.

Copy link

commented May 11, 2019

Codecov Report

Merging #52787 into 2018.3 will decrease coverage by 19.1%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           2018.3   #52787       +/-   ##
===========================================
- Coverage   38.02%   18.92%   -19.11%     
===========================================
  Files        1512     1514        +2     
  Lines      256994   257030       +36     
  Branches    55076    55063       -13     
===========================================
- Hits        97721    48634    -49087     
- Misses     148308   202642    +54334     
+ Partials    10965     5754     -5211
Flag Coverage Δ
#arch ?
#centos6 ?
#centos7 ?
#debian8 ?
#debian9 ?
#fedora28 ?
#m2crypto ?
#opensuse15 ?
#opensuse42 ?
#proxy ?
#py2 ?
#py3 18.92% <ø> (-18.04%) ⬇️
#pycryptodomex ?
#raet ?
#tornado ?
#ubuntu1604 ?
#ubuntu1804 18.92% <ø> (?)
#windows2016 ?
Impacted Files Coverage Δ
salt/executors/__init__.py 0% <0%> (-100%) ⬇️
salt/config/schemas/minion.py 0% <0%> (-100%) ⬇️
salt/config/schemas/ssh.py 0% <0%> (-100%) ⬇️
salt/sdb/env.py 0% <0%> (-100%) ⬇️
salt/renderers/__init__.py 0% <0%> (-100%) ⬇️
salt/sdb/__init__.py 0% <0%> (-100%) ⬇️
salt/config/schemas/common.py 0% <0%> (-100%) ⬇️
salt/serializers/python.py 0% <0%> (-100%) ⬇️
salt/config/schemas/esxdatacenter.py 0% <0%> (-100%) ⬇️
salt/pillar/nodegroups.py 0% <0%> (-100%) ⬇️
... and 915 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2479f23...6de8f98. Read the comment docs.

@codecov

This comment has been minimized.

Copy link

commented May 11, 2019

Codecov Report

Merging #52787 into 2018.3 will decrease coverage by 18.56%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           2018.3   #52787       +/-   ##
===========================================
- Coverage   37.48%   18.92%   -18.57%     
===========================================
  Files        1512     1514        +2     
  Lines      257022   257030        +8     
  Branches    55077    55063       -14     
===========================================
- Hits        96343    48634    -47709     
- Misses     149640   202642    +53002     
+ Partials    11039     5754     -5285
Flag Coverage Δ
#arch ?
#centos7 ?
#debian8 ?
#debian9 ?
#m2crypto ?
#proxy ?
#py2 ?
#py3 18.92% <ø> (-17.48%) ⬇️
#pycryptodomex ?
#raet ?
#tornado ?
#ubuntu1604 ?
#ubuntu1804 18.92% <ø> (?)
Impacted Files Coverage Δ
salt/executors/__init__.py 0% <0%> (-100%) ⬇️
salt/config/schemas/minion.py 0% <0%> (-100%) ⬇️
salt/config/schemas/ssh.py 0% <0%> (-100%) ⬇️
salt/renderers/__init__.py 0% <0%> (-100%) ⬇️
salt/sdb/__init__.py 0% <0%> (-100%) ⬇️
salt/config/schemas/common.py 0% <0%> (-100%) ⬇️
salt/serializers/python.py 0% <0%> (-100%) ⬇️
salt/config/schemas/esxdatacenter.py 0% <0%> (-100%) ⬇️
salt/pillar/nodegroups.py 0% <0%> (-100%) ⬇️
salt/tops/__init__.py 0% <0%> (-100%) ⬇️
... and 898 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8570a74...5b9453e. Read the comment docs.

@twangboy

This comment has been minimized.

Copy link
Contributor

commented May 13, 2019

@garethgreenaway Looks like you got some lint.... and I don't know what's up with that CentOS test.

…ption should be raised. Different approaches depending on Py2 vs Py3.
…lt from get_python_executable is a valid value. Maintaining backwards compatibilty to run tests without Nox.
… or greater. Removing the test that simulates versions of pip below 1.0.
…lt from get_python_executable is a valid value. Maintaining backwards compatibilty to run tests without Nox.
…st on OS X because it hangs the test suite.
…enaway/salt into fixes_test_pip_state_sls_files
@twangboy twangboy changed the title [WIP][2018.3] Fixes to test_pip state sls files [2018.3] Fixes to test_pip state sls files May 20, 2019
twangboy added 2 commits May 21, 2019
@twangboy twangboy merged commit 9ecbc47 into saltstack:2018.3 May 22, 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
@twangboy

This comment has been minimized.

Copy link
Contributor

commented May 22, 2019

Need to make sure this gets merged forward

Ch3LL added a commit that referenced this pull request Jun 20, 2019
Cherry-Pick #52787 into 2019.2.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.