valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't import old module name

Browse Source 
We'll handle the old name when backporting
This commit is contained in:
Erik Johnson 2018-05-15 15:35:33 -05:00
parent a97e0320bf
commit 6433c48d8c
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/support/parser/__init__.py
View File

@ -39,15 +39,9 @@ import salt.utils.data
import salt.utils.files
import salt.utils.path
import salt.utils.platform
import salt.utils.stringutils
import salt.utils.yaml
try:
# 2018.3 and later
from salt.utils.stringutils import expr_match as _expr_match
except ImportError:
# 2017.7 and earlier
from salt.utils import expr_match as _expr_match
try:
from tests.support.ext import console
WIDTH, HEIGHT = console.getTerminalSize()
@ -438,7 +432,7 @@ class SaltTestingParser(optparse.OptionParser):
# Next, try the filename_map
for path_expr in filename_map:
for filename in files:
if _expr_match(filename, path_expr):
if salt.utils.stringutils.expr_match(filename, path_expr):
ret.update(filename_map[path_expr])
break