valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2019-05-01 15:14:39 -07:00 committed by Ch3LL
parent 8a57270c1e
commit 4ec90c2d39
No known key found for this signature in database
GPG Key ID: 132B55A7C13EFA73
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/files/file/base/issue-2028-pip-installed.sls
View File

@ -3,7 +3,9 @@
- system_site_packages: False
- distribute: True
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
{%- if salt.runtests_helpers.get_python_executable() %}
- python: {{ salt.runtests_helpers.get_python_executable() }}
{%- endif %}
pep8-pip:
pip.installed:

2
tests/integration/files/file/base/issue-46127-pip-env-vars.sls
View File

@ -6,7 +6,9 @@
- system_site_packages: False
- distribute: True
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
{%- if salt.runtests_helpers.get_python_executable() %}
- python: {{ salt.runtests_helpers.get_python_executable() }}
{%- endif %}
install_older_venv_1:
pip.installed: