mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-28 21:31:26 -07:00
Porting tests to pytest (#33387)
* Porting tests to pytest * Achievement Get: No longer need mock/generator.py * Now done via pytest's parametrization * Port safe_eval to pytest * Port text tests to pytest * Port test_set_mode_if_different to pytest * Change conftest AnsibleModule fixtures to be more flexible * Move the AnsibleModules fixtures to module_utils/conftest.py for sharing * Testing the argspec code requires: * injecting both the argspec and the arguments. * Patching the arguments into sys.stdin at a different level * More porting to obsolete mock/procenv.py * Port run_command to pytest * Port known_hosts tests to pytest * Port safe_eval to pytest * Port test_distribution_version.py to pytest * Port test_log to pytest * Port test__log_invocation to pytest * Remove unneeded import of procenv in test_postgresql * Port test_pip to pytest style * As part of this, create a pytest ansiblemodule fixture in modules/conftest.py. This is slightly different than the approach taken in module_utils because here we need to override the AnsibleModule that the modules will inherit from instead of one that we're instantiating ourselves. * Fixup usage of parametrization in test_deprecate_warn * Check that the pip module failed in our test
This commit is contained in:
parent
ed376abe42
commit
cd36164239
16 changed files with 812 additions and 1117 deletions
|
@ -1,34 +1,23 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# (c) 2016 Toshio Kuratomi <tkuratomi@ansible.com>
|
||||
#
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
# Copyright (c) 2017 Ansible Project
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
# Make coding more python3-ish
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.module_utils.six import PY3
|
||||
from units.mock.generator import add_method
|
||||
import itertools
|
||||
|
||||
import pytest
|
||||
|
||||
from ansible.module_utils.six import PY3
|
||||
|
||||
# Internal API while this is still being developed. Eventually move to
|
||||
# module_utils.text
|
||||
# module_utils.common.text
|
||||
from ansible.module_utils._text import to_text, to_bytes, to_native
|
||||
|
||||
|
||||
# Format: byte representation, text representation, encoding of byte representation
|
||||
VALID_STRINGS = (
|
||||
(b'abcde', u'abcde', 'ascii'),
|
||||
|
@ -40,29 +29,25 @@ VALID_STRINGS = (
|
|||
)
|
||||
|
||||
|
||||
def _check_to_text(self, in_string, encoding, expected):
|
||||
@pytest.mark.parametrize('in_string, encoding, expected',
|
||||
itertools.chain(((d[0], d[2], d[1]) for d in VALID_STRINGS),
|
||||
((d[1], d[2], d[1]) for d in VALID_STRINGS)))
|
||||
def test_to_text(in_string, encoding, expected):
|
||||
"""test happy path of decoding to text"""
|
||||
self.assertEqual(to_text(in_string, encoding), expected)
|
||||
assert to_text(in_string, encoding) == expected
|
||||
|
||||
|
||||
def _check_to_bytes(self, in_string, encoding, expected):
|
||||
@pytest.mark.parametrize('in_string, encoding, expected',
|
||||
itertools.chain(((d[0], d[2], d[0]) for d in VALID_STRINGS),
|
||||
((d[1], d[2], d[0]) for d in VALID_STRINGS)))
|
||||
def test_to_bytes(in_string, encoding, expected):
|
||||
"""test happy path of encoding to bytes"""
|
||||
self.assertEqual(to_bytes(in_string, encoding), expected)
|
||||
assert to_bytes(in_string, encoding) == expected
|
||||
|
||||
|
||||
def _check_to_native(self, in_string, encoding, py2_expected, py3_expected):
|
||||
@pytest.mark.parametrize('in_string, encoding, expected',
|
||||
itertools.chain(((d[0], d[2], d[1] if PY3 else d[0]) for d in VALID_STRINGS),
|
||||
((d[1], d[2], d[1] if PY3 else d[0]) for d in VALID_STRINGS)))
|
||||
def test_to_native(in_string, encoding, expected):
|
||||
"""test happy path of encoding to native strings"""
|
||||
if PY3:
|
||||
self.assertEqual(to_native(in_string, encoding), py3_expected)
|
||||
else:
|
||||
self.assertEqual(to_native(in_string, encoding), py2_expected)
|
||||
|
||||
|
||||
@add_method(_check_to_text, [(i[0], i[2], i[1]) for i in VALID_STRINGS])
|
||||
@add_method(_check_to_text, [(i[1], i[2], i[1]) for i in VALID_STRINGS])
|
||||
@add_method(_check_to_bytes, [(i[0], i[2], i[0]) for i in VALID_STRINGS])
|
||||
@add_method(_check_to_bytes, [(i[1], i[2], i[0]) for i in VALID_STRINGS])
|
||||
@add_method(_check_to_native, [(i[0], i[2], i[0], i[1]) for i in VALID_STRINGS])
|
||||
@add_method(_check_to_native, [(i[1], i[2], i[0], i[1]) for i in VALID_STRINGS])
|
||||
class TestModuleUtilsText(unittest.TestCase):
|
||||
pass
|
||||
assert to_native(in_string, encoding) == expected
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue