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

Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754)

Browse source 
(cherry picked from commit 2167ce6cb6)
This commit is contained in:
Sloane Hertel 2018-09-17 18:17:43 -04:00 committed by Toshio Kuratomi
parent af4971fd1a
commit e881ea8957
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/units/modules/cloud/amazon/test_cloudformation.py
View file

@ -120,7 +120,7 @@ def test_get_nonexistent_stack(placeboify):
assert cfn_module.get_stack_facts(connection, 'ansible-test-nonexist') is None assert cfn_module.get_stack_facts(connection, 'ansible-test-nonexist') is None
def test_missing_template_body(placeboify): def test_missing_template_body():
m = FakeModule() m = FakeModule()
with pytest.raises(Exception, message='Expected module to fail with no template') as exc_info: with pytest.raises(Exception, message='Expected module to fail with no template') as exc_info:
cfn_module.create_stack( cfn_module.create_stack(

10
test/units/modules/cloud/amazon/test_data_pipeline.py
View file

@ -180,33 +180,33 @@ def test_delete_pipeline(placeboify, maybe_sleep):
assert changed is True assert changed is True
def test_build_unique_id_different(placeboify, maybe_sleep): def test_build_unique_id_different():
m = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id'}) m = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id'})
m2 = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id-different'}) m2 = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id-different'})
assert data_pipeline.build_unique_id(m) != data_pipeline.build_unique_id(m2) assert data_pipeline.build_unique_id(m) != data_pipeline.build_unique_id(m2)
def test_build_unique_id_same(placeboify, maybe_sleep): def test_build_unique_id_same():
m = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id', 'tags': {'ansible': 'test'}}) m = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id', 'tags': {'ansible': 'test'}})
m2 = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id', 'tags': {'ansible': 'test'}}) m2 = FakeModule(**{'name': 'ansible-unittest-1', 'description': 'test-unique-id', 'tags': {'ansible': 'test'}})
assert data_pipeline.build_unique_id(m) == data_pipeline.build_unique_id(m2) assert data_pipeline.build_unique_id(m) == data_pipeline.build_unique_id(m2)
def test_build_unique_id_obj(placeboify, maybe_sleep): def test_build_unique_id_obj():
# check that the object can be different and the unique id should be the same; should be able to modify objects # check that the object can be different and the unique id should be the same; should be able to modify objects
m = FakeModule(**{'name': 'ansible-unittest-1', 'objects': [{'first': 'object'}]}) m = FakeModule(**{'name': 'ansible-unittest-1', 'objects': [{'first': 'object'}]})
m2 = FakeModule(**{'name': 'ansible-unittest-1', 'objects': [{'second': 'object'}]}) m2 = FakeModule(**{'name': 'ansible-unittest-1', 'objects': [{'second': 'object'}]})
assert data_pipeline.build_unique_id(m) == data_pipeline.build_unique_id(m2) assert data_pipeline.build_unique_id(m) == data_pipeline.build_unique_id(m2)
def test_format_tags(placeboify, maybe_sleep): def test_format_tags():
unformatted_tags = {'key1': 'val1', 'key2': 'val2', 'key3': 'val3'} unformatted_tags = {'key1': 'val1', 'key2': 'val2', 'key3': 'val3'}
formatted_tags = data_pipeline.format_tags(unformatted_tags) formatted_tags = data_pipeline.format_tags(unformatted_tags)
for tag_set in formatted_tags: for tag_set in formatted_tags:
assert unformatted_tags[tag_set['key']] == tag_set['value'] assert unformatted_tags[tag_set['key']] == tag_set['value']
def test_format_empty_tags(placeboify, maybe_sleep): def test_format_empty_tags():
unformatted_tags = {} unformatted_tags = {}
formatted_tags = data_pipeline.format_tags(unformatted_tags) formatted_tags = data_pipeline.format_tags(unformatted_tags)
assert formatted_tags == [] assert formatted_tags == []