TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-10 16:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

testing: make the FAIL tests more verbose, to ease remote CI failure diagnostics

Browse Source
This commit is contained in:
Delyan Angelov 2024-01-21 17:46:24 +02:00
parent 65a1d2fdbd
commit 4991fc7491
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/tools/modules/testing/common.v
View File

@ -11,6 +11,7 @@ import v.pref
import v.util.vtest import v.util.vtest
import runtime import runtime
import rand import rand
import strings
pub const github_job = os.getenv('GITHUB_JOB') pub const github_job = os.getenv('GITHUB_JOB')
@ -42,6 +43,7 @@ pub const is_go_present = os.execute('go version').exit_code == 0
pub const all_processes = get_all_processes() pub const all_processes = get_all_processes()
pub const header_bytes_to_search_for_module_main = 500 pub const header_bytes_to_search_for_module_main = 500
pub const separator = '-'.repeat(100)
fn get_fail_retry_delay_ms() time.Duration { fn get_fail_retry_delay_ms() time.Duration {
return os.getenv_opt('VTEST_FAIL_RETRY_DELAY_MS') or { '500' }.int() * time.millisecond return os.getenv_opt('VTEST_FAIL_RETRY_DELAY_MS') or { '500' }.int() * time.millisecond
@ -506,7 +508,11 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
} }
cmd := '${os.quoted_path(ts.vexe)} -skip-running ${cmd_options.join(' ')} ${os.quoted_path(file)}' cmd := '${os.quoted_path(ts.vexe)} -skip-running ${cmd_options.join(' ')} ${os.quoted_path(file)}'
run_cmd := if run_js { 'node ${generated_binary_fpath}' } else { generated_binary_fpath } run_cmd := if run_js {
'node ${os.quoted_path(generated_binary_fpath)}'
} else {
os.quoted_path(generated_binary_fpath)
}
ts.benchmark.step() ts.benchmark.step()
tls_bench.step() tls_bench.step()
if relative_file.replace('\\', '/') in ts.skip_files { if relative_file.replace('\\', '/') in ts.skip_files {
@ -561,7 +567,7 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
time.sleep(testing.fail_retry_delay_ms) time.sleep(testing.fail_retry_delay_ms)
} }
if details.flaky && !testing.fail_flaky { if details.flaky && !testing.fail_flaky {
ts.append_message(.info, ' *FAILURE* of the known flaky test file ${relative_file} is ignored, since VTEST_FAIL_FLAKY is 0 . Retry count: ${details.retry} .', ts.append_message(.info, ' *FAILURE* of the known flaky test file ${relative_file} is ignored, since VTEST_FAIL_FLAKY is 0 . Retry count: ${details.retry} .\ncmd: ${cmd}',
mtc) mtc)
unsafe { unsafe {
goto test_passed_system goto test_passed_system
@ -591,7 +597,8 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
ts.benchmark.fail() ts.benchmark.fail()
tls_bench.fail() tls_bench.fail()
ts.append_message_with_duration(.fail, tls_bench.step_message_with_label_and_duration(benchmark.b_fail, ts.append_message_with_duration(.fail, tls_bench.step_message_with_label_and_duration(benchmark.b_fail,
normalised_relative_file, cmd_duration, '${normalised_relative_file}\n>> compilation failed:\n${compile_r.output}',
cmd_duration,
preparation: compile_cmd_duration preparation: compile_cmd_duration
), cmd_duration, mtc) ), cmd_duration, mtc)
ts.add_failed_cmd(cmd) ts.add_failed_cmd(cmd)
@ -606,11 +613,15 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
} }
// //
ts.append_message(.cmd_begin, run_cmd, mtc) ts.append_message(.cmd_begin, run_cmd, mtc)
mut failure_output := strings.new_builder(1024)
d_cmd := time.new_stopwatch() d_cmd := time.new_stopwatch()
mut r := os.execute(run_cmd) mut r := os.execute(run_cmd)
cmd_duration = d_cmd.elapsed() cmd_duration = d_cmd.elapsed()
ts.append_message_with_duration(.cmd_end, r.output, cmd_duration, mtc) ts.append_message_with_duration(.cmd_end, r.output, cmd_duration, mtc)
if r.exit_code != 0 { if r.exit_code != 0 {
failure_output.write_string(testing.separator)
failure_output.writeln(' retry: 0')
failure_output.writeln(r.output.trim_space())
details := get_test_details(file) details := get_test_details(file)
os.setenv('VTEST_RETRY_MAX', '${details.retry}', true) os.setenv('VTEST_RETRY_MAX', '${details.retry}', true)
for retry := 1; retry <= details.retry; retry++ { for retry := 1; retry <= details.retry; retry++ {
@ -629,10 +640,14 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
goto test_passed_execute goto test_passed_execute
} }
} }
failure_output.write_string(testing.separator)
failure_output.writeln(' retry: ${retry}')
failure_output.writeln(r.output.trim_space())
time.sleep(testing.fail_retry_delay_ms) time.sleep(testing.fail_retry_delay_ms)
} }
full_failure_output := failure_output.str().trim_space()
if details.flaky && !testing.fail_flaky { if details.flaky && !testing.fail_flaky {
ts.append_message(.info, ' *FAILURE* of the known flaky test file ${relative_file} is ignored, since VTEST_FAIL_FLAKY is 0 . Retry count: ${details.retry} .', ts.append_message(.info, ' *FAILURE* of the known flaky test file ${relative_file} is ignored, since VTEST_FAIL_FLAKY is 0 . Retry count: ${details.retry} .\n comp_cmd: ${cmd}\n run_cmd: ${run_cmd}',
mtc) mtc)
unsafe { unsafe {
goto test_passed_execute goto test_passed_execute
@ -640,9 +655,9 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
} }
ts.benchmark.fail() ts.benchmark.fail()
tls_bench.fail() tls_bench.fail()
ending_newline := if r.output.ends_with('\n') { '\n' } else { '' } cmd_duration = d_cmd.elapsed() - (testing.fail_retry_delay_ms * details.retry)
ts.append_message_with_duration(.fail, tls_bench.step_message_with_label_and_duration(benchmark.b_fail, ts.append_message_with_duration(.fail, tls_bench.step_message_with_label_and_duration(benchmark.b_fail,
'${normalised_relative_file}\n${r.output.trim_space()}${ending_newline}', '${normalised_relative_file}\n comp_cmd: ${cmd}\n run_cmd: ${run_cmd}\nfailure output:\n${full_failure_output}',
cmd_duration, cmd_duration,
preparation: compile_cmd_duration preparation: compile_cmd_duration
), cmd_duration, mtc) ), cmd_duration, mtc)

7
vlib/strings/builder.c.v
View File

@ -141,11 +141,12 @@ pub fn (mut b Builder) write_string(s string) {
// b.buf << []u8(s) // TODO // b.buf << []u8(s) // TODO
} }
// writeln appends the string `s`+`\n` to the buffer // writeln_string appends the string `s`+`\n` to the buffer
@[deprecated: 'use writeln() instead']
@[deprecated_after: '2024-03-21']
@[inline] @[inline]
pub fn (mut b Builder) writeln_string(s string) { pub fn (mut b Builder) writeln_string(s string) {
b.write_string(s) b.writeln(s)
b.write_string('\n')
} }
// go_back discards the last `n` bytes from the buffer // go_back discards the last `n` bytes from the buffer