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

Merge pull request #5 from s0undt3ch/hotfix/rally-boto

Browse Source 
Bring the global variables more into their context
This commit is contained in:
Nicole Thomas 2014-08-11 15:55:28 -06:00
commit 92054dbe8b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/modules/boto_secgroup.py
View File

@ -6,17 +6,16 @@ import string
from collections import OrderedDict
from copy import deepcopy
HAS_BOTO = True
HAS_MOTO = True
# import Python Third Party Libs
try:
import boto
HAS_BOTO = True
except ImportError:
HAS_BOTO = False
try:
from moto import mock_ec2
HAS_MOTO = True
except ImportError:
HAS_MOTO = False

5
tests/unit/modules/boto_vpc.py
View File

@ -1,16 +1,15 @@
# -*- coding: utf-8 -*-
HAS_BOTO = True
HAS_MOTO = True
# import Python Third Party Libs
try:
import boto
HAS_BOTO = True
except ImportError:
HAS_BOTO = False
try:
from moto import mock_ec2
HAS_MOTO = True
except ImportError:
HAS_MOTO = False