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

Merge pull request #52732 from dwoz/backport_test_fixes

Browse source 
Backport test fixes
This commit is contained in:
Daniel Wozniak 2019-04-28 21:20:14 -07:00 • committed by GitHub
commit be259ecb45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
salt/states/pip_state.py
View file

@ -44,40 +44,32 @@ try:
HAS_PIP = True
except ImportError:
HAS_PIP = False
# Remove references to the loaded pip module above so reloading works
import sys
pip_related_entries = [
(k, v) for (k, v) in sys.modules.items()
or getattr(v, '__module__', '').startswith('pip.')
or (isinstance(v, types.ModuleType) and v.__name__.startswith('pip.'))
]
for name, entry in pip_related_entries:
sys.modules.pop(name)
del entry
del pip
sys_modules_pip = sys.modules.pop('pip', None)
if sys_modules_pip is not None:
del sys_modules_pip
if HAS_PIP is True:
try:
from pip.req import InstallRequirement
_from_line = InstallRequirement.from_line
except ImportError:
# pip 10.0.0 move req module under pip._internal
try:
try:
from pip._internal.req import InstallRequirement
_from_line = InstallRequirement.from_line
except AttributeError:
from pip._internal.req.constructors import install_req_from_line as _from_line
except ImportError:
HAS_PIP = False
# Remove references to the loaded pip module above so reloading works
import sys
pip_related_entries = [
(k, v) for (k, v) in sys.modules.items()
or getattr(v, '__module__', '').startswith('pip.')
or (isinstance(v, types.ModuleType) and v.__name__.startswith('pip.'))
]
for name, entry in pip_related_entries:
sys.modules.pop(name)
del entry
del pip
sys_modules_pip = sys.modules.pop('pip', None)
if sys_modules_pip is not None:
del sys_modules_pip
try:
from pip.exceptions import InstallationError
except ImportError:
if salt.utils.compare_versions(ver1=pip.__version__,
oper='>=',
ver2='18.1'):
from pip._internal.exceptions import InstallationError # pylint: disable=E0611,E0401
elif salt.utils.compare_versions(ver1=pip.__version__,
oper='>=',
ver2='10.0'):
from pip.exceptions import InstallationError # pylint: disable=E0611,E0401
else:
InstallationError = ValueError
# pylint: enable=import-error
@ -88,6 +80,23 @@ log = logging.getLogger(__name__)
__virtualname__ = 'pip'
def _from_line(*args, **kwargs):
import pip
if salt.utils.compare_versions(ver1=pip.__version__,
oper='>=',
ver2='18.1'):
import pip._internal.req.constructors # pylint: disable=E0611,E0401
return pip._internal.req.constructors.install_req_from_line(*args, **kwargs)
elif salt.utils.compare_versions(ver1=pip.__version__,
oper='>=',
ver2='10.0'):
import pip._internal.req # pylint: disable=E0611,E0401
return pip._internal.req.InstallRequirement.from_line(*args, **kwargs)
else:
import pip.req # pylint: disable=E0611,E0401
return pip.req.InstallRequirement.from_line(*args, **kwargs)
def __virtual__():
'''
Only load if the pip module is available in __salt__

1
tests/unit/modules/test_libcloud_dns.py
View file

@ -28,6 +28,7 @@ def get_mock_driver():
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not libcloud_dns.HAS_LIBCLOUD, 'No libcloud installed')
class LibcloudDnsModuleTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):

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

@ -9,6 +9,7 @@
# Import python libs
from __future__ import absolute_import
import logging
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin, SaltReturnAssertsMixin
@ -17,7 +18,6 @@ from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# Import salt libs
import salt.states.pip_state as pip_state
import salt.utils
# Import 3rd-party libs
try:
@ -27,6 +27,9 @@ except ImportError:
HAS_PIP = False
log = logging.getLogger(__name__)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not HAS_PIP,
'The \'pip\' library is not importable(installed system-wide)')
@ -42,6 +45,7 @@ class PipStateTest(TestCase, SaltReturnAssertsMixin, LoaderModuleMockMixin):
}
def test_install_requirements_parsing(self):
log.debug("Real pip version is %s", pip.__version__)
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
pip_list = MagicMock(return_value={'pep8': '1.3.3'})
pip_version = pip.__version__
@ -50,19 +54,12 @@ class PipStateTest(TestCase, SaltReturnAssertsMixin, LoaderModuleMockMixin):
with patch.dict(pip_state.__salt__, {'cmd.run_all': mock,
'pip.list': pip_list}):
with patch.dict(pip_state.__opts__, {'test': True}):
if salt.utils.compare_versions(ver1=pip_version,
oper='<',
ver2='10.0'):
ret = pip_state.installed('pep8=1.3.2')
self.assertSaltFalseReturn({'test': ret})
self.assertInSaltComment(
'Invalid version specification in package pep8=1.3.2. '
'\'=\' is not supported, use \'==\' instead.',
{'test': ret})
else:
self.assertRaises(
pip._internal.exceptions.InstallationError,
pip_state.installed, 'pep=1.3.2')
ret = pip_state.installed('pep8=1.3.2')
self.assertSaltFalseReturn({'test': ret})
self.assertInSaltComment(
'Invalid version specification in package pep8=1.3.2. '
'\'=\' is not supported, use \'==\' instead.',
{'test': ret})
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
pip_list = MagicMock(return_value={'pep8': '1.3.3'})