From fab924959762bb8d771bd079a00e8ae1a0df8f20 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 14 Sep 2018 11:12:06 -0700 Subject: [stable-2.6] Minor cleanup of code-smell tests. (#45658) * Minor cleanup of code-smell tests. * Add exception handling for YAML load.. (cherry picked from commit e7426e379575811714e062990ea42a20c79633a4) Co-authored-by: Matt Clay --- test/sanity/code-smell/no-illegal-filenames.py | 8 ++++---- test/sanity/code-smell/no-tests-as-filters.py | 2 +- test/sanity/code-smell/no-underscore-variable.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/sanity/code-smell/no-illegal-filenames.py b/test/sanity/code-smell/no-illegal-filenames.py index 52959d3e17..1a663c5aa7 100755 --- a/test/sanity/code-smell/no-illegal-filenames.py +++ b/test/sanity/code-smell/no-illegal-filenames.py @@ -53,8 +53,8 @@ ILLEGAL_END_CHARS = [ ] -def check_path(path, dir=False): - type_name = 'directory' if dir else 'file' +def check_path(path, is_dir=False): + type_name = 'directory' if is_dir else 'file' parent, file_name = os.path.split(path) name, ext = os.path.splitext(file_name) @@ -85,10 +85,10 @@ def main(): continue for dir_name in dirs: - check_path(os.path.join(root, dir_name), dir=True) + check_path(os.path.join(root, dir_name), is_dir=True) for file_name in files: - check_path(os.path.join(root, file_name), dir=False) + check_path(os.path.join(root, file_name), is_dir=False) if __name__ == '__main__': diff --git a/test/sanity/code-smell/no-tests-as-filters.py b/test/sanity/code-smell/no-tests-as-filters.py index 18581bdc20..792dc98834 100755 --- a/test/sanity/code-smell/no-tests-as-filters.py +++ b/test/sanity/code-smell/no-tests-as-filters.py @@ -45,7 +45,7 @@ TEST_MAP = { } -FILTER_RE = re.compile(r'((.+?)\s*(?P[\w \.\'"]+)(\s*)\|(\s*)(?P\w+))') +FILTER_RE = re.compile(r'((.+?)\s*(?P[\w .\'"]+)(\s*)\|(\s*)(?P\w+))') def main(): diff --git a/test/sanity/code-smell/no-underscore-variable.py b/test/sanity/code-smell/no-underscore-variable.py index 3ec540fe63..bba6173f7e 100755 --- a/test/sanity/code-smell/no-underscore-variable.py +++ b/test/sanity/code-smell/no-underscore-variable.py @@ -129,7 +129,7 @@ def main(): with open(path, 'r') as path_fd: for line, text in enumerate(path_fd.readlines()): - match = re.search(r'(?: |[^C]\()(_)(?: |,|\))', text) + match = re.search(r'(?: |[^C]\()(_)(?:[ ,)])', text) if match: print('%s:%d:%d: use `dummy` instead of `_` for a variable name' % ( -- cgit v1.2.1