mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
9e780b9d5e
* Fix typo in redhat_subscription testcase * Fix macports state=present matching against the wrong package name Previous implementation returned true if the desired package name occurred anywhere in the list of all installed packages. For example as a substring of another package name, or even as a substring of a variant name for a different package. Instead: - request macports only list installed packages matching the desired package name, instead of all installed packages. - Note `port` exits with 0 regardless of whether any packages match the requested name. - pass `-q` flag: "Do not print the header line. This is useful when parsing the output of port installed in scripts for further processing." - eliminate `use_unsafe_shell=True` by searching stdout contents natively in python instead of using `grep`. This has the added benefit of eliminating any potential misinterpretation of characters in the package name as regex special characters. If there are zero matching installed packages, `out` is empty. If there are one or more matches (due to multiple installed versions), the output format is:ec8a2bc682/src/port/port.tcl (L3320-L3323)Notably, two leading spaces, the package name, a space, and then other information. According to blame via github, those lines haven't changed in 11 years. * Update macports state=active to eliminate use_unsafe_shell Similar to previous commit (for macports state=present): - pass `-q` flag: "Do not print the header line. This is useful when parsing the output of port installed in scripts for further processing." - search stdout contents natively in python instead of using `grep`. - added parentheses to search string to eliminate false positives if the package name or variants contain the word `active`. Still could fail if they contain `(active)`, but that's less likely If there are zero matching installed packages, `out` is empty. If there are one or more matches (due to multiple installed versions), the output format is:ec8a2bc682/src/port/port.tcl (L3320-L3323)For "state=active", we're looking for a line that contains `(active)` in the output. * Basic test case of query_port for present and active * Attempt to fix lint errors in test * Different mock module creation, changed test cases indentation/spacing - picked the wrong mock code to cargo-cult. Thanks to felixfontein for this suggestion - 4 space indentation on continuation line. I thought I had that originally, but it looks like my editor sabotaged me with mixed tabs/spaces - Remove leading newline on multi-line test cases. I don't think it would make a difference, but I'd read up on how the python syntax works and want to more accurately represent macports output. fingers crossed this addresses the known build errors * Add changelog fragment * Update tests/unit/plugins/modules/packaging/os/test_macports.py Co-authored-by: Felix Fontein <felix@fontein.de> * Update changelogs/fragments/1307-macports-fix-status-check.yml Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commitd669e2b60d) Co-authored-by: Dan Jackson <dan@djackson.org>
34 lines
1.7 KiB
Python
34 lines
1.7 KiB
Python
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
from __future__ import (absolute_import, division, print_function)
|
|
__metaclass__ = type
|
|
|
|
from ansible.module_utils import basic
|
|
from ansible_collections.community.general.plugins.modules.packaging.os import macports
|
|
|
|
import pytest
|
|
|
|
TESTED_MODULE = macports.__name__
|
|
|
|
QUERY_PORT_TEST_CASES = [
|
|
pytest.param('', False, False, id='Not installed'),
|
|
pytest.param(' git @2.29.2_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_28', True, False, id='Installed but not active'),
|
|
pytest.param(' git @2.29.2_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_28 (active)', True, True, id='Installed and active'),
|
|
pytest.param(''' git @2.29.2_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_28
|
|
git @2.28.1_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_28
|
|
''', True, False, id='2 versions installed, neither active'),
|
|
pytest.param(''' git @2.29.2_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_28 (active)
|
|
git @2.28.1_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_28
|
|
''', True, True, id='2 versions installed, one active'),
|
|
]
|
|
|
|
|
|
@pytest.mark.parametrize("run_cmd_return_val, present_expected, active_expected", QUERY_PORT_TEST_CASES)
|
|
def test_macports_query_port(mocker, run_cmd_return_val, present_expected, active_expected):
|
|
module = mocker.Mock()
|
|
run_command = mocker.Mock()
|
|
run_command.return_value = (0, run_cmd_return_val, '')
|
|
module.run_command = run_command
|
|
|
|
assert macports.query_port(module, 'port', 'git', state="present") == present_expected
|
|
assert macports.query_port(module, 'port', 'git', state="active") == active_expected
|