rm extra whitespace in python, per PEP8

This commit is contained in:
Christopher Dunn 2015-01-24 15:29:52 -06:00
parent f4bc0bf4ec
commit 494950a63d
17 changed files with 489 additions and 495 deletions

View File

@ -211,18 +211,15 @@ def generate_html_report( html_report_path, builds ):
build_status = 'ok' if build.build_succeeded else 'FAILED' build_status = 'ok' if build.build_succeeded else 'FAILED'
cmake_log_url = os.path.relpath(build.cmake_log_path, report_dir) cmake_log_url = os.path.relpath(build.cmake_log_path, report_dir)
build_log_url = os.path.relpath(build.build_log_path, report_dir) build_log_url = os.path.relpath(build.build_log_path, report_dir)
td = '<td class="%s"><a href="%s" class="%s">CMake: %s</a>' % ( td = '<td class="%s"><a href="%s" class="%s">CMake: %s</a>' % ( build_status.lower(), cmake_log_url, cmake_status.lower(), cmake_status)
build_status.lower(), cmake_log_url, cmake_status.lower(), cmake_status)
if build.cmake_succeeded: if build.cmake_succeeded:
td += '<br><a href="%s" class="%s">Build: %s</a>' % ( td += '<br><a href="%s" class="%s">Build: %s</a>' % ( build_log_url, build_status.lower(), build_status)
build_log_url, build_status.lower(), build_status)
td += '</td>' td += '</td>'
else: else:
td = '<td></td>' td = '<td></td>'
tds.append(td) tds.append(td)
tr_builds.append('<tr>%s</tr>' % '\n'.join(tds)) tr_builds.append('<tr>%s</tr>' % '\n'.join(tds))
html = HTML_TEMPLATE.substitute( html = HTML_TEMPLATE.substitute( title='Batch build report',
title='Batch build report',
th_vars=' '.join(th_vars), th_vars=' '.join(th_vars),
th_build_types=' '.join(th_build_types), th_build_types=' '.join(th_build_types),
tr_builds='\n'.join(tr_builds)) tr_builds='\n'.join(tr_builds))

View File

@ -161,8 +161,7 @@ def generate(env):
Add builders and construction variables for the Add builders and construction variables for the
SrcDist tool. SrcDist tool.
""" """
## doxyfile_scanner = env.Scanner( ## doxyfile_scanner = env.Scanner(## DoxySourceScan,
## DoxySourceScan,
## "DoxySourceScan", ## "DoxySourceScan",
## scan_check = DoxySourceScanCheck, ## scan_check = DoxySourceScanCheck,
##) ##)

View File

@ -75,8 +75,7 @@ def runAllTests( jsontest_executable_path, input_dir = None,
print('TESTING:', input_path, end=' ') print('TESTING:', input_path, end=' ')
options = is_json_checker_test and '--json-checker' or '' options = is_json_checker_test and '--json-checker' or ''
options += ' --json-writer %s'%writerClass options += ' --json-writer %s'%writerClass
cmd = '%s%s %s "%s"' % ( cmd = '%s%s %s "%s"' % ( valgrind_path, jsontest_executable_path, options,
valgrind_path, jsontest_executable_path, options,
input_path) input_path)
status, process_output = getStatusOutput(cmd) status, process_output = getStatusOutput(cmd)
if is_json_checker_test: if is_json_checker_test:

View File

@ -53,8 +53,7 @@ def runAllTests( exe_path, use_valgrind=False ):
print() print()
for name, result in failures: for name, result in failures:
print(result) print(result)
print('%d/%d tests passed (%d failure(s))' % ( print('%d/%d tests passed (%d failure(s))' % ( pass_count, len(test_names), failed_count))
pass_count, len(test_names), failed_count))
return 1 return 1
else: else:
print('All %d tests passed' % len(test_names)) print('All %d tests passed' % len(test_names))