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 #24146 from rallytime/fix_centos_boto_failure

Browse source 
Fixes the boto_vpc_test failure on CentOS 5 tests
This commit is contained in:
Justin Findlay 2015-05-26 14:15:19 -06:00
commit 51c3cec5d7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/unit/modules/boto_vpc_test.py
View file

@ -6,14 +6,12 @@ from salttesting.mock import patch
try:
import boto
from boto.exception import BotoServerError
HAS_BOTO = True
except ImportError:
HAS_BOTO = False
try:
from moto import mock_ec2
HAS_MOTO = True
except ImportError:
HAS_MOTO = False
@ -51,6 +49,8 @@ ensure_in_syspath('../../')
# which was added in boto 2.8.0
# https://github.com/boto/boto/commit/33ac26b416fbb48a60602542b4ce15dcc7029f12
required_boto_version = '2.8.0'
required_moto_version = '0.3.7'
region = 'us-east-1'
access_key = 'GKTADJGHEIQSXMKKRBJ08H'
secret_key = 'askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs'
@ -84,8 +84,11 @@ def _has_required_moto():
return False
else:
import pkg_resources
if LooseVersion(pkg_resources.get_distribution('moto').version) < LooseVersion('0.3.7'):
from pkg_resources import DistributionNotFound
try:
if LooseVersion(pkg_resources.get_distribution('moto').version) < LooseVersion(required_moto_version):
return False
except DistributionNotFound:
return False
return True