ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

get rid of assert_in

Browse source
This commit is contained in:
Robin Roth 2016-04-15 19:30:49 +02:00
parent 692bf51fde
commit 4088aa2b4c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/units/module_utils/test_distribution_version.py
View file

@ -29,7 +29,7 @@ from ansible.utils.unicode import to_bytes
# for testing # for testing
from ansible.compat.tests import unittest from ansible.compat.tests import unittest
from ansible.compat.tests.mock import patch from ansible.compat.tests.mock import patch
from nose.tools import assert_in, assert_equal from nose.tools import assert_equal
# the module we are actually testing # the module we are actually testing
@ -322,7 +322,7 @@ def test_distribution_version():
""" """
# needs to be in here, because the import fails with python3 still # needs to be in here, because the import fails with python3 still
import ansible.module_utils.facts import ansible.module_utils.facts as facts
real_stdin = sys.stdin real_stdin = sys.stdin
from ansible.module_utils import basic from ansible.module_utils import basic
@ -339,13 +339,13 @@ def test_distribution_version():
# run individual tests via generator # run individual tests via generator
# set nicer stdout output for nosetest # set nicer stdout output for nosetest
_test_one_distribution.description = "check distribution_version for %s" % t['name'] _test_one_distribution.description = "check distribution_version for %s" % t['name']
yield _test_one_distribution, module, t yield _test_one_distribution, facts, module, t
sys.stdin = real_stdin sys.stdin = real_stdin
def _test_one_distribution(module, testcase): def _test_one_distribution(facts, module, testcase):
"""run the test on one distribution testcase """run the test on one distribution testcase
* prepare some mock functions to get the testdata in * prepare some mock functions to get the testdata in
@ -380,13 +380,13 @@ def _test_one_distribution(module, testcase):
@patch('platform.dist', lambda: testcase['platform.dist']) @patch('platform.dist', lambda: testcase['platform.dist'])
@patch('platform.system', lambda: 'Linux') @patch('platform.system', lambda: 'Linux')
def get_facts(testcase): def get_facts(testcase):
return ansible.module_utils.facts.Facts(module).populate() return facts.Facts(module).populate()
generated_facts = get_facts(testcase) generated_facts = get_facts(testcase)
# testcase['result'] has a list of variables and values it expects Facts() to set # testcase['result'] has a list of variables and values it expects Facts() to set
for key, val in testcase['result'].items(): for key, val in testcase['result'].items():
assert_in(key, generated_facts) assert key in generated_facts
msg = 'Comparing value of %s on %s, should: %s, is: %s' %\ msg = 'Comparing value of %s on %s, should: %s, is: %s' %\
(key, testcase['name'], val, generated_facts[key]) (key, testcase['name'], val, generated_facts[key])
assert_equal(generated_facts[key], val, msg) assert_equal(generated_facts[key], val, msg)