thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log skipped test if no jinja2

Browse Source
This commit is contained in:
vdimir 2021-07-20 17:49:20 +03:00
parent a170af9b49
commit 8429f64030
No known key found for this signature in database
GPG Key ID: F57B3E10A21DBB31
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/clickhouse-test
View File

@ -416,13 +416,13 @@ def run_tests_array(all_tests_with_params):
status = '' status = ''
if not is_concurrent: if not is_concurrent:
sys.stdout.flush() sys.stdout.flush()
sys.stdout.write("{0:72}".format(name + ": ")) sys.stdout.write("{0:72}".format(removesuffix(name, ".gen", ".sql") + ": "))
# This flush is needed so you can see the test name of the long # This flush is needed so you can see the test name of the long
# running test before it will finish. But don't do it in parallel # running test before it will finish. But don't do it in parallel
# mode, so that the lines don't mix. # mode, so that the lines don't mix.
sys.stdout.flush() sys.stdout.flush()
else: else:
status = "{0:72}".format(name + ": ") status = "{0:72}".format(removesuffix(name, ".gen", ".sql") + ": ")
if args.skip and any(s in name for s in args.skip): if args.skip and any(s in name for s in args.skip):
status += MSG_SKIPPED + " - skip\n" status += MSG_SKIPPED + " - skip\n"
@ -443,6 +443,9 @@ def run_tests_array(all_tests_with_params):
or 'race' in name): or 'race' in name):
status += MSG_SKIPPED + " - no long\n" status += MSG_SKIPPED + " - no long\n"
skipped_total += 1 skipped_total += 1
elif not USE_JINJA and ext.endswith("j2"):
status += MSG_SKIPPED + " - no jinja\n"
skipped_total += 1
else: else:
disabled_file = os.path.join(suite_dir, name) + '.disabled' disabled_file = os.path.join(suite_dir, name) + '.disabled'
@ -471,7 +474,6 @@ def run_tests_array(all_tests_with_params):
stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout' stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout'
stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr' stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr'
testcase_args = configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file) testcase_args = configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file)
proc, stdout, stderr, total_time = run_single_test(testcase_args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file) proc, stdout, stderr, total_time = run_single_test(testcase_args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file)
@ -832,8 +834,6 @@ def get_selected_tests(suite_dir, patterns):
continue continue
if USE_JINJA and test_name.endswith(".gen.sql"): if USE_JINJA and test_name.endswith(".gen.sql"):
continue continue
if not USE_JINJA and test_name.endswith(".j2"):
continue
test_name = render_test_template(j2env, suite_dir, test_name) test_name = render_test_template(j2env, suite_dir, test_name)
yield test_name yield test_name