From f53f29352d2d191b0cbf475ca52db8880b8e943b Mon Sep 17 00:00:00 2001 From: Sloane Hertel Date: Thu, 22 Mar 2018 14:57:59 -0400 Subject: [PATCH] Move AWS placebo fixtures into test/units/utils so module_utils tests can use them (#37300) --- .../modules/cloud/amazon/test_aws_direct_connect_connection.py | 2 +- .../amazon/test_aws_direct_connect_link_aggregation_group.py | 2 +- test/units/modules/cloud/amazon/test_cloudformation.py | 2 +- test/units/modules/cloud/amazon/test_data_pipeline.py | 2 +- test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py | 2 +- .../placebo_fixtures.py => utils/amazon_placebo_fixtures.py} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename test/units/{modules/cloud/amazon/placebo_fixtures.py => utils/amazon_placebo_fixtures.py} (100%) diff --git a/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py b/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py index e42d3ba62a..ef98c7c6cb 100644 --- a/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py +++ b/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -from . placebo_fixtures import placeboify, maybe_sleep +from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import aws_direct_connect_connection from ansible.module_utils.ec2 import get_aws_connection_info, boto3_conn diff --git a/test/units/modules/cloud/amazon/test_aws_direct_connect_link_aggregation_group.py b/test/units/modules/cloud/amazon/test_aws_direct_connect_link_aggregation_group.py index 56472df9f0..0506741b8d 100644 --- a/test/units/modules/cloud/amazon/test_aws_direct_connect_link_aggregation_group.py +++ b/test/units/modules/cloud/amazon/test_aws_direct_connect_link_aggregation_group.py @@ -18,7 +18,7 @@ import pytest import os import collections -from . placebo_fixtures import placeboify, maybe_sleep +from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import aws_direct_connect_link_aggregation_group as lag_module from ansible.module_utils.ec2 import get_aws_connection_info, boto3_conn diff --git a/test/units/modules/cloud/amazon/test_cloudformation.py b/test/units/modules/cloud/amazon/test_cloudformation.py index 9434372f68..9ba0ca9aeb 100644 --- a/test/units/modules/cloud/amazon/test_cloudformation.py +++ b/test/units/modules/cloud/amazon/test_cloudformation.py @@ -18,7 +18,7 @@ import pytest from mock import patch -from .placebo_fixtures import placeboify, maybe_sleep +from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import cloudformation as cfn_module basic_yaml_tpl = """ diff --git a/test/units/modules/cloud/amazon/test_data_pipeline.py b/test/units/modules/cloud/amazon/test_data_pipeline.py index 05cbeea078..3739588955 100644 --- a/test/units/modules/cloud/amazon/test_data_pipeline.py +++ b/test/units/modules/cloud/amazon/test_data_pipeline.py @@ -20,7 +20,7 @@ import json import collections import pytest -from . placebo_fixtures import placeboify, maybe_sleep +from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import data_pipeline from ansible.module_utils._text import to_text diff --git a/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py b/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py index 37a9e7845e..03513bfefc 100644 --- a/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py +++ b/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py @@ -17,7 +17,7 @@ import pytest import os -from . placebo_fixtures import placeboify, maybe_sleep +from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import ec2_vpc_vpn from ansible.module_utils._text import to_text from ansible.module_utils.ec2 import get_aws_connection_info, boto3_conn, boto3_tag_list_to_ansible_dict diff --git a/test/units/modules/cloud/amazon/placebo_fixtures.py b/test/units/utils/amazon_placebo_fixtures.py similarity index 100% rename from test/units/modules/cloud/amazon/placebo_fixtures.py rename to test/units/utils/amazon_placebo_fixtures.py