internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PR #11388/defd1560 backport][stable-12] pmem: remove redundant use of regexp (#11398)

Browse Source 
pmem: remove redundant use of regexp (#11388)

* pmem: remove redundant use of regexp

* add changelog frag

* add bugfixes extry

* Update plugins/modules/pmem.py



* Update plugins/modules/pmem.py



---------


(cherry picked from commit defd15609c)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
patchback[bot]
2026-01-07 20:50:56 +01:00
committed by GitHub
parent e714d15891
commit 6169699b24
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelogs/fragments/11388-pmem-redundant-regexps.yml Normal file
View File

@@ -0,0 +1,4 @@
bugfixes:
- pmem - fix test for invalid data input (https://github.com/ansible-collections/community.general/pull/11388).
minor_changes:
- pmem - simplify text tests without using regular expression (https://github.com/ansible-collections/community.general/pull/11388).

11
plugins/modules/pmem.py
View File

@@ -199,7 +199,6 @@ EXAMPLES = r"""
"""
import json
import re
import traceback
from ansible.module_utils.basic import AnsibleModule, missing_required_lib, human_to_bytes
@@ -493,19 +492,17 @@ class PersistentMemory:
return ipmctl_opts
def is_allocation_good(self, ipmctl_out, command):
warning = re.compile("WARNING")
error = re.compile(".*Error.*")
ignore_error = re.compile("Do you want to continue? [y/n] Error: Invalid data input.")
ignore_error = "Do you want to continue? [y/n] Error: Invalid data input."
errmsg = ""
rc = True
for line in ipmctl_out.splitlines():
if warning.match(line):
if line.startswith("WARNING"):
errmsg = f"{line} (command: {command})"
rc = False
break
elif error.match(line):
if not ignore_error:
elif "Error" in line:
if not line.startswith(ignore_error):
errmsg = f"{line} (command: {command})"
rc = False
break