Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-21 22:09:23 +01:00
Code Releases Activity

test-runner: fix matching with --verbose

Browse Source 
The new regex match update was actually matching way more than it should
have due to how python's 'match' API works. 'match' will return successfully
if zero or more characters match from the beginning of the string. In this
case we actually need the entire regex to match otherwise we start matching
all prefixes, for example:

"--verbose iwd" will match iwd, iwd-dhcp, iwd-acd, iwd-genl and iwd-tls.

Instead use re.fullmatch which requires the entire string to match the
regex.
This commit is contained in:
James Prestwood 2022-06-21 11:25:18 -07:00 committed by Denis Kenzior
parent f4279ebf53
commit 8f42507641
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/utils.py
View File

@ -8,7 +8,7 @@ import dbus
from gi.repository import GLib from gi.repository import GLib
from weakref import WeakValueDictionary from weakref import WeakValueDictionary
from re import match from re import fullmatch
from runner import RunnerCoreArgParse from runner import RunnerCoreArgParse
@ -99,7 +99,7 @@ class Process(subprocess.Popen):
# Handle any regex matches # Handle any regex matches
for item in Process.testargs.verbose: for item in Process.testargs.verbose:
try: try:
if match(item, process): if fullmatch(item, process):
return True return True
except Exception as e: except Exception as e:
print("%s is not a valid regex" % item) print("%s is not a valid regex" % item)