saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix #56433 - test_pip_installed_specific_env

Browse source
This commit is contained in:
ch3ll 2020-03-23 16:16:43 -04:00
parent 249367b462
commit 86fe450c82
No known key found for this signature in database
GPG key ID: 1124C6796EBDBD8D
2 changed files with 68 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/states/pip_state.py
View file

@ -940,6 +940,7 @@ def installed(name,
'Collecting',
'Cloning',
'Cleaning up...',
'Looking in indexes',
]
for line in pip_install_call.get('stdout', '').split('\n'):
if not any(

67
tests/unit/states/test_pip_state.py
View file

@ -10,6 +10,7 @@
# Import python libs
from __future__ import absolute_import, print_function, unicode_literals
import logging
import os
import sys
import subprocess
@ -18,6 +19,7 @@ from tests.support.mixins import LoaderModuleMockMixin, SaltReturnAssertsMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import MagicMock, patch
from tests.support.helpers import dedent, VirtualEnv
from tests.support.runtests import RUNTIME_VARS
# Import salt libs
import salt.version
@ -261,6 +263,71 @@ class PipStateTest(TestCase, SaltReturnAssertsMixin, LoaderModuleMockMixin):
{'test': ret}
)
def test_install_requirements_custom_pypi(self):
'''
test requirement parsing for both when a custom
pypi index-url is set and when it is not and
the requirement is already installed.
'''
# create requirements file
req_filename = os.path.join(
RUNTIME_VARS.TMP_STATE_TREE, 'custom-pypi-requirements.txt'
)
with salt.utils.files.fopen(req_filename, 'wb') as reqf:
reqf.write(b'pep8\n')
site_pkgs = '/tmp/pip-env/lib/python3.7/site-packages'
check_stdout = [('Looking in indexes: https://custom-pypi-url.org,'
'https://pypi.org/simple/\nRequirement already satisfied: pep8 in {1}'
'(from -r /tmp/files/prod/{0} (line 1)) (1.7.1)'.format(req_filename, site_pkgs)),
('Requirement already satisfied: pep8 in {1}'
'(from -r /tmp/files/prod/{0} (line1)) (1.7.1)'.format(req_filename, site_pkgs))]
pip_version = pip.__version__
mock_pip_version = MagicMock(return_value=pip_version)
for stdout in check_stdout:
pip_install = MagicMock(return_value={'retcode': 0, 'stdout': stdout})
with patch.dict(pip_state.__salt__, {'pip.version': mock_pip_version}):
with patch.dict(pip_state.__salt__, {'pip.install': pip_install}):
ret = pip_state.installed(name='', requirements=req_filename)
self.assertSaltTrueReturn({'test': ret})
assert 'Requirements were already installed.' == ret['comment']
def test_install_requirements_custom_pypi_changes(self):
'''
test requirement parsing for both when a custom
pypi index-url is set and when it is not and
the requirement is not installed.
'''
# create requirements file
req_filename = os.path.join(
RUNTIME_VARS.TMP_STATE_TREE, 'custom-pypi-requirements.txt'
)
with salt.utils.files.fopen(req_filename, 'wb') as reqf:
reqf.write(b'pep8\n')
site_pkgs = '/tmp/pip-env/lib/python3.7/site-packages'
check_stdout = [('Looking in indexes: https://custom-pypi-url.org,'
'https://pypi.org/simple/\nCollecting pep8\n Using cached'
'https://custom-pypi-url.org//packages/42/3f/669429cef5acb4/pep8-1.7.1-py2.py3-none-any.whl'
' (41 kB)\nInstalling collected packages: pep8\nSuccessfully installed pep8-1.7.1'),
('Collecting pep8\n Using cached'
'https://custom-pypi-url.org//packages/42/3f/669429cef5acb4/pep8-1.7.1-py2.py3-none-any.whl'
' (41 kB)\nInstalling collected packages: pep8\nSuccessfully installed pep8-1.7.1')]
pip_version = pip.__version__
mock_pip_version = MagicMock(return_value=pip_version)
for stdout in check_stdout:
pip_install = MagicMock(return_value={'retcode': 0, 'stdout': stdout})
with patch.dict(pip_state.__salt__, {'pip.version': mock_pip_version}):
with patch.dict(pip_state.__salt__, {'pip.install': pip_install}):
ret = pip_state.installed(name='', requirements=req_filename)
self.assertSaltTrueReturn({'test': ret})
assert 'Successfully processed requirements file {0}.'.format(req_filename) == ret['comment']
def test_install_in_editable_mode(self):
'''
Check that `name` parameter containing bad characters is not parsed by