From 91eb28a9898a974dc3402e3199f0950271c492e5 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Thu, 25 Aug 2016 12:28:16 -0600 Subject: [PATCH] Fix pylint errors in scripts_regression_tests --- utils/python/tests/scripts_regression_tests.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/python/tests/scripts_regression_tests.py b/utils/python/tests/scripts_regression_tests.py index 563f912c945c..c418b0a6d912 100755 --- a/utils/python/tests/scripts_regression_tests.py +++ b/utils/python/tests/scripts_regression_tests.py @@ -480,7 +480,6 @@ def test_create_test_rebless_namelist(self): fake = .true. /""" baseline_area = self._baseline_area - compiler = self._compiler baseline_glob = glob.glob(os.path.join(baseline_area, self._baseline_name, "TEST*")) self.assertEqual(len(baseline_glob), 3, msg="Expected three matches, got:\n%s" % "\n".join(baseline_glob)) @@ -1091,8 +1090,8 @@ def test_check_code(self): from distutils.spawn import find_executable pylint = find_executable("pylint") if pylint is not None: - stat, output, _ = run_cmd("pylint --version") - pylintver = re.search(r"pylint\s+(\d+)\.(\d+).(\d+)", output) + output = run_cmd_no_fail("pylint --version") + pylintver = re.search(r"pylint\s+(\d+)[.](\d+)[.](\d+)", output) major = int(pylintver.group(1)) minor = int(pylintver.group(2)) if pylint is None or (major <= 1 and minor < 5):