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

removing unwanted commits from this branch

Browse source 
Conflicts:
  - salt/states/pip_state.py
  - tests/support/helpers.py
This commit is contained in:
Gareth J. Greenaway 2019-05-14 18:05:09 -07:00 • committed by Ch3LL
parent e0b0ba8c71
commit 6c452b3f4c
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/pip_state.py
View file

@ -66,8 +66,8 @@ if HAS_PIP is True:
ver2='18.1'):
from pip._internal.exceptions import InstallationError # pylint: disable=E0611,E0401
elif salt.utils.versions.compare(ver1=pip.__version__,
oper='>=',
ver2='1.0'):
oper='>=',
ver2='1.0'):
from pip.exceptions import InstallationError # pylint: disable=E0610,E0401
else:
InstallationError = ValueError

5
tests/support/helpers.py
View file

@ -209,10 +209,7 @@ def flaky(caller=None, condition=True, attempts=4):
return caller(cls)
except Exception as exc:
if attempt >= attempts -1:
if six.PY2:
raise
else:
raise exc
raise exc
backoff_time = attempt ** 2
log.info(
'Found Exception. Waiting %s seconds to retry.',