maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge #12720: qa: Avoiding 'file' function name from python2

Browse source 
0dbb32b2cb Avoiding 'file' function name from python2 with more descriptive variable naming (Jeff Rade)

Pull request description:

  @jnewbery Here is PR from review in [#12437](https://github.com/bitcoin/bitcoin/pull/12437)

Tree-SHA512: c61980f4d3170842627cd970e1f6eebaf303843dc5e95a9dcfe3ded08152be533774cb75f56a83af8452b6bcac17c0172cf20e39edf9acefb4a4c255fe893a3b
This commit is contained in:
MarcoFalke 2018-03-19 09:54:15 -04:00
parent 00d1680498 0dbb32b2cb
commit 872c921c0a
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/functional/test_runner.py
View file

@ -433,7 +433,7 @@ class TestHandler:
proc.send_signal(signal.SIGINT) proc.send_signal(signal.SIGINT)
if proc.poll() is not None: if proc.poll() is not None:
log_out.seek(0), log_err.seek(0) log_out.seek(0), log_err.seek(0)
[stdout, stderr] = [file.read().decode('utf-8') for file in (log_out, log_err)] [stdout, stderr] = [log_file.read().decode('utf-8') for log_file in (log_out, log_err)]
log_out.close(), log_err.close() log_out.close(), log_err.close()
if proc.returncode == TEST_EXIT_PASSED and stderr == "": if proc.returncode == TEST_EXIT_PASSED and stderr == "":
status = "Passed" status = "Passed"
@ -490,7 +490,7 @@ def check_script_list(src_dir):
Check that there are no scripts in the functional tests directory which are Check that there are no scripts in the functional tests directory which are
not being run by pull-tester.py.""" not being run by pull-tester.py."""
script_dir = src_dir + '/test/functional/' script_dir = src_dir + '/test/functional/'
python_files = set([file for file in os.listdir(script_dir) if file.endswith(".py")]) python_files = set([test_file for test_file in os.listdir(script_dir) if test_file.endswith(".py")])
missed_tests = list(python_files - set(map(lambda x: x.split()[0], ALL_SCRIPTS + NON_SCRIPTS))) missed_tests = list(python_files - set(map(lambda x: x.split()[0], ALL_SCRIPTS + NON_SCRIPTS)))
if len(missed_tests) != 0: if len(missed_tests) != 0:
print("%sWARNING!%s The following scripts are not being run: %s. Check the test lists in test_runner.py." % (BOLD[1], BOLD[0], str(missed_tests))) print("%sWARNING!%s The following scripts are not being run: %s. Check the test lists in test_runner.py." % (BOLD[1], BOLD[0], str(missed_tests)))
@ -550,8 +550,8 @@ class RPCCoverage():
if not os.path.isfile(coverage_ref_filename): if not os.path.isfile(coverage_ref_filename):
raise RuntimeError("No coverage reference found") raise RuntimeError("No coverage reference found")
with open(coverage_ref_filename, 'r') as file: with open(coverage_ref_filename, 'r') as coverage_ref_file:
all_cmds.update([line.strip() for line in file.readlines()]) all_cmds.update([line.strip() for line in coverage_ref_file.readlines()])
for root, dirs, files in os.walk(self.dir): for root, dirs, files in os.walk(self.dir):
for filename in files: for filename in files:
@ -559,8 +559,8 @@ class RPCCoverage():
coverage_filenames.add(os.path.join(root, filename)) coverage_filenames.add(os.path.join(root, filename))
for filename in coverage_filenames: for filename in coverage_filenames:
with open(filename, 'r') as file: with open(filename, 'r') as coverage_file:
covered_cmds.update([line.strip() for line in file.readlines()]) covered_cmds.update([line.strip() for line in coverage_file.readlines()])
return all_cmds - covered_cmds return all_cmds - covered_cmds