fix test boto imports

Test boto imports are failing for some reason
This commit is contained in:
Daniel Wallace 2018-01-11 15:12:37 -07:00 committed by rallytime
parent 2340f0b487
commit 0cd95d1cc6
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
6 changed files with 1314 additions and 0 deletions

File diff suppressed because it is too large Load diff

View file

@ -5,11 +5,16 @@ from __future__ import absolute_import
import logging
from copy import deepcopy
import pkg_resources
import os.path
# imprt salt paths
from tests.support.paths import TESTS_DIR
# import Python Third Party Libs
# pylint: disable=import-error
try:
import boto
boto.ENDPOINTS_PATH = os.path.join(TESTS_DIR, 'unit/files/endpoints.json')
import boto.ec2.elb
HAS_BOTO = True
except ImportError:

View file

@ -5,11 +5,13 @@ from __future__ import absolute_import
import random
import string
from copy import deepcopy
import os.path
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON
from tests.support.paths import TESTS_DIR
# Import Salt libs
import salt.config
@ -23,6 +25,7 @@ import salt.modules.boto_secgroup as boto_secgroup
from salt.ext.six.moves import range # pylint: disable=redefined-builtin
try:
import boto
boto.ENDPOINTS_PATH = os.path.join(TESTS_DIR, 'unit/files/endpoints.json')
import boto.ec2 # pylint: enable=unused-import
HAS_BOTO = True
except ImportError:

View file

@ -7,6 +7,7 @@
from __future__ import absolute_import
import random
import string
import os.path
# pylint: disable=3rd-party-module-not-gated
import pkg_resources
from pkg_resources import DistributionNotFound
@ -16,6 +17,7 @@ from pkg_resources import DistributionNotFound
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.paths import TESTS_DIR
# Import Salt libs
import salt.config
@ -32,6 +34,7 @@ from salt.ext.six.moves import range # pylint: disable=redefined-builtin
# pylint: disable=no-name-in-module,unused-import
try:
import boto
boto.ENDPOINTS_PATH = os.path.join(TESTS_DIR, 'unit/files/endpoints.json')
import boto3
from boto.exception import BotoServerError
HAS_BOTO = True

View file

@ -4,11 +4,14 @@
from __future__ import absolute_import
import random
import string
import os.path
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch
from tests.support.paths import TESTS_DIR
# Import Salt libs
import salt.utils.boto
@ -23,6 +26,7 @@ from tests.unit.modules.test_boto_vpc import BotoVpcTestCaseMixin
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
try:
import boto
boto.ENDPOINTS_PATH = os.path.join(TESTS_DIR, 'unit/files/endpoints.json')
import boto3
from boto.exception import BotoServerError

View file

@ -2,11 +2,13 @@
# Import python libs
from __future__ import absolute_import
import os.path
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.paths import TESTS_DIR
# Import Salt libs
import salt.utils.boto
@ -18,6 +20,7 @@ from salt.utils.versions import LooseVersion
# pylint: disable=import-error
try:
import boto
boto.ENDPOINTS_PATH = os.path.join(TESTS_DIR, 'unit/files/endpoints.json')
import boto.exception
from boto.exception import BotoServerError