diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-03 13:58:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-03 13:58:47 +0100 |
| commit | 06d32a0c177e4166ff0491668cd459464bc2ef45 (patch) | |
| tree | 7170e33bcc8e37240d37f053e9bb75aa17c09de8 | |
| parent | 89083466fa565bea22832687ec5fe89a70a3b8f7 (diff) | |
| download | vim-git-06d32a0c177e4166ff0491668cd459464bc2ef45.tar.gz | |
patch 9.0.0369: a failing flaky test doesn't mention the timev9.0.0369
Problem: A failing flaky test doesn't mention the time.
Solution: Add the time for debugging. Improve error message.
| -rw-r--r-- | src/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | src/testdir/shared.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index c7140e530..91977c949 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -465,6 +465,7 @@ for g:testfunc in sort(s:tests) " A test can set g:test_is_flaky to retry running the test. let g:test_is_flaky = 0 + let starttime = strftime("%T") call RunTheTest(g:testfunc) " Repeat a flaky test. Give up when: @@ -475,10 +476,10 @@ for g:testfunc in sort(s:tests) \ && $TEST_NO_RETRY == '' \ && g:test_is_flaky while 1 - call add(s:messages, 'Found errors in ' . g:testfunc . ':') + call add(s:messages, 'Found errors in ' .. g:testfunc .. ':') call extend(s:messages, v:errors) - call add(total_errors, 'Run ' . g:run_nr . ':') + call add(total_errors, starttime .. ' Run ' .. g:run_nr .. ':') call extend(total_errors, v:errors) if g:run_nr >= 5 || prev_error == v:errors[0] @@ -498,6 +499,7 @@ for g:testfunc in sort(s:tests) let v:errors = [] let g:run_nr += 1 + let starttime = strftime("%T") call RunTheTest(g:testfunc) if len(v:errors) == 0 diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index 0f0ffe878..72cf8368c 100644 --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -98,16 +98,16 @@ func RunServer(cmd, testfunc, args) try let g:currentJob = RunCommand(pycmd) - " Wait for up to 2 seconds for the port number to be there. + " Wait for some time for the port number to be there. let port = GetPort() if port == 0 - call assert_false(1, "Can't start " . a:cmd) + call assert_report(strftime("%T") .. " Can't start " .. a:cmd) return endif call call(function(a:testfunc), [port]) catch - call assert_false(1, 'Caught exception: "' . v:exception . '" in ' . v:throwpoint) + call assert_report('Caught exception: "' . v:exception . '" in ' . v:throwpoint) finally call s:kill_server(a:cmd) endtry diff --git a/src/version.c b/src/version.c index b2e28e297..9eba6bf33 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 369, +/**/ 368, /**/ 367, |