Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 07a5f1f

Browse files
committed
Logging tests to limited 120 char line width, upload after results are logged
1 parent b22fbae commit 07a5f1f

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

ifj2017/test/logger.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,16 @@ def log_results(cls, reports):
120120
cls.BOLD,
121121
' {:.2f}%'.format((float(success) / (total - skipped)) * 100),
122122
cls.END,
123-
' ({}/{})\n\t'.format(success, total - skipped),
123+
' ({}/{})\n'.format(success, total - skipped),
124124
cls.END,
125125
cls.BOLD,
126126
''.join(
127127
(
128-
(cls.FAIL + '×', cls.GREEN + '')[report.success]
128+
((cls.FAIL + '×', cls.GREEN + '.')[report.success]
129129
if report.success is not None
130-
else cls.BLUE + '-'
131-
)
132-
for report in reports),
130+
else cls.BLUE + '_')
131+
) + ('\n' if not (i % 120) else '')
132+
for i, report in enumerate(reports, start=1)),
133133
''
134134
)
135135
return bool(total - success)

ifj2017/test/runner.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def __init__(self, args):
7070
super(TestRunner, self).__init__()
7171
assert path.isfile(args.compiler) and os.access(args.compiler, os.X_OK), \
7272
"Given compiler ({}) is file and is executable.".format(args.compiler)
73-
assert args.no_interpreter or (path.isfile(args.interpreter) and os.access(args.interpreter, os.X_OK)), \
73+
assert args.no_interpreter or (path.isfile(args.interpreter) and os.access(args.interpreter, os.X_OK)), \
7474
"Given interpreter ({}) is file and is executable.".format(args.interpreter)
7575
assert isinstance(args.command_timeout, float) and args.command_timeout > 0, \
7676
'Command timeout is positive int'
@@ -125,7 +125,7 @@ def run(self):
125125
return 1
126126

127127
self._run_tests()
128-
128+
result = TestLogger.log_results(self._reports)
129129
if self._uploader.has_connection:
130130
try:
131131
response = self._uploader.send_reports()
@@ -137,8 +137,7 @@ def run(self):
137137
TestLogger.log_warning('Unable to send reports ({}), terminating...'.format(e))
138138
else:
139139
TestLogger.log_warning('Results upload skipped.')
140-
141-
return TestLogger.log_results(self._reports)
140+
return result
142141

143142
def _run_tests(self):
144143
for test_section_dir in self._loader.load_section_dirs():
@@ -333,6 +332,7 @@ def _save_report(self, test_info, report):
333332
in enumerate(lines, start=1)
334333
if line
335334
) or '# ---')
335+
write('\n' * 2)
336336
self._reports.append(report)
337337
TestLogger._test_case_success = report.success
338338
TestLogger._test_case_skipped = report.skipped
@@ -359,10 +359,9 @@ def _welcome_message(self):
359359
TestLogger.log(
360360
TestLogger.GREEN,
361361
TestLogger.BOLD,
362-
"Activated {} extensions: {}{}.".format(
363-
len(self._extensions),
362+
"Activated extensions: {}{}.".format(
364363
', '.join(sorted(self._extensions)),
365-
' - autoloaded from {}'.format(self._extensions_auto_loaded_from)
364+
' from {}'.format(self._extensions_auto_loaded_from)
366365
if self._extensions_auto_loaded_from else ''
367366
),
368367
)

ifj2017/tests/02_functions/tests.json___jb_tmp___

Whitespace-only changes.

0 commit comments

Comments
 (0)