wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove botocore from top-level execution in lambda_policy tests

Browse source 
Even though the tests are skipped, the `ClientError` uses outside the
test cause a failure even though the tests never run
This commit is contained in:
Ryan S. Brown 2017-12-04 09:57:40 -05:00 committed by Brian Coca
parent 33cbae0873
commit 5087ce9273
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/units/modules/cloud/amazon/test_lambda_policy.py
View file

@ -31,9 +31,13 @@ if not HAS_BOTO3:
pytestmark = pytest.mark.skip("test_api_gateway.py requires the `boto3` and `botocore` modules") pytestmark = pytest.mark.skip("test_api_gateway.py requires the `boto3` and `botocore` modules")
# these are here cause ... boto! # these are here cause ... boto!
from botocore.exceptions import ClientError
import ansible.modules.cloud.amazon.lambda_policy as lambda_policy import ansible.modules.cloud.amazon.lambda_policy as lambda_policy
from ansible.modules.cloud.amazon.lambda_policy import setup_module_object from ansible.modules.cloud.amazon.lambda_policy import setup_module_object
try:
from botocore.exceptions import ClientError
except ImportError:
pass
base_module_args = { base_module_args = {
"region": "us-west-1", "region": "us-west-1",
@ -100,13 +104,12 @@ fake_policy_return = {
error_response = {'Error': {'Code': 'ResourceNotFoundException', 'Message': 'Fake Testing Error'}} error_response = {'Error': {'Code': 'ResourceNotFoundException', 'Message': 'Fake Testing Error'}}
operation_name = 'FakeOperation' operation_name = 'FakeOperation'
resource_not_found_e = ClientError(error_response, operation_name)
def test_manage_state_adds_missing_permissions(): def test_manage_state_adds_missing_permissions():
lambda_client_double = MagicMock() lambda_client_double = MagicMock()
# Policy actually: not present Requested State: present Should: create # Policy actually: not present Requested State: present Should: create
lambda_client_double.get_policy.side_effect = resource_not_found_e lambda_client_double.get_policy.side_effect = ClientError(error_response, operation_name)
fake_module_params = copy.deepcopy(fake_module_params_present) fake_module_params = copy.deepcopy(fake_module_params_present)
module_double.params = fake_module_params module_double.params = fake_module_params
lambda_policy.manage_state(module_double, lambda_client_double) lambda_policy.manage_state(module_double, lambda_client_double)
@ -154,7 +157,7 @@ def test_manage_state_removes_unwanted_permissions():
def test_manage_state_leaves_already_removed_permissions(): def test_manage_state_leaves_already_removed_permissions():
lambda_client_double = MagicMock() lambda_client_double = MagicMock()
# Policy actually: absent Requested State: absent Should: do nothing # Policy actually: absent Requested State: absent Should: do nothing
lambda_client_double.get_policy.side_effect = resource_not_found_e lambda_client_double.get_policy.side_effect = ClientError(error_response, operation_name)
fake_module_params = copy.deepcopy(fake_module_params_absent) fake_module_params = copy.deepcopy(fake_module_params_absent)
module_double.params = fake_module_params module_double.params = fake_module_params
lambda_policy.manage_state(module_double, lambda_client_double) lambda_policy.manage_state(module_double, lambda_client_double)