cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[cloud][test] Use pytest conditional imports instead of nose/SkipTest (#22019)

Browse source
This commit is contained in:
Ryan Brown 2017-03-02 17:07:56 -05:00 committed by GitHub
parent 7b2c013e5a
commit fc0ae5ee6b
4 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/units/modules/cloud/amazon/test_ec2_vpc_nat_gateway.py
View file

@ -1,17 +1,9 @@
from nose.plugins.skip import SkipTest import pytest
try:
import boto3
import botocore
HAS_BOTO3 = True
except ImportError:
HAS_BOTO3 = False
if not HAS_BOTO3:
raise SkipTest("test_ec2_vpc_nat_gateway.py requires the python module 'boto3' and 'botocore'")
import unittest import unittest
boto3 = pytest.importorskip("boto3")
botocore = pytest.importorskip("botocore")
from collections import namedtuple from collections import namedtuple
from ansible.parsing.dataloader import DataLoader from ansible.parsing.dataloader import DataLoader
from ansible.vars import VariableManager from ansible.vars import VariableManager

16
test/units/modules/cloud/amazon/test_kinesis_stream.py
View file

@ -1,17 +1,9 @@
from nose.plugins.skip import SkipTest import pytest
try:
import boto3
import botocore
HAS_BOTO3 = True
except ImportError:
HAS_BOTO3 = False
if not HAS_BOTO3:
raise SkipTest("test_kinesis_stream.py requires the python module 'boto3' and 'botocore'")
import unittest import unittest
boto3 = pytest.importorskip("boto3")
botocore = pytest.importorskip("botocore")
import ansible.modules.cloud.amazon.kinesis_stream as kinesis_stream import ansible.modules.cloud.amazon.kinesis_stream as kinesis_stream
aws_region = 'us-west-2' aws_region = 'us-west-2'

7
test/units/modules/cloud/amazon/test_lambda.py
View file

@ -19,15 +19,14 @@
# Make coding more python3-ish # Make coding more python3-ish
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
from nose.plugins.skip import SkipTest import pytest
boto3 = pytest.importorskip("boto3")
import json import json
import copy import copy
from ansible.module_utils._text import to_bytes from ansible.module_utils._text import to_bytes
from ansible.module_utils import basic from ansible.module_utils import basic
from ansible.compat.tests.mock import MagicMock, Mock, patch from ansible.compat.tests.mock import MagicMock, Mock, patch
from ansible.module_utils.ec2 import HAS_BOTO3
if not HAS_BOTO3:
raise SkipTest("test_ec2_asg.py requires the `boto3`, and `botocore` modules")
# lambda is a keyword so we have to hack this. # lambda is a keyword so we have to hack this.
_temp = __import__("ansible.modules.cloud.amazon.lambda") _temp = __import__("ansible.modules.cloud.amazon.lambda")

12
test/units/modules/cloud/amazon/test_s3.py
View file

@ -1,13 +1,5 @@
from nose.plugins.skip import SkipTest import pytest
boto = pytest.importorskip("boto")
try:
import boto
HAS_BOTO = True
except ImportError:
HAS_BOTO = False
if not HAS_BOTO:
raise SkipTest("test_s3.py requires the python module 'boto'")
import unittest import unittest
import ansible.modules.cloud.amazon.s3 as s3 import ansible.modules.cloud.amazon.s3 as s3