diff options
| -rw-r--r-- | test/old/testdir/runtest.vim | 6 | ||||
| -rw-r--r-- | test/old/testdir/shared.vim | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/test/old/testdir/runtest.vim b/test/old/testdir/runtest.vim index 3c5699af73..9ba0af1764 100644 --- a/test/old/testdir/runtest.vim +++ b/test/old/testdir/runtest.vim @@ -434,6 +434,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: @@ -445,10 +446,10 @@ for g:testfunc in sort(s:tests) \ && (index(s:flaky_tests, g:testfunc) >= 0 \ || 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] @@ -468,6 +469,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/test/old/testdir/shared.vim b/test/old/testdir/shared.vim index 33f6d9a2d0..70a3ab7eee 100644 --- a/test/old/testdir/shared.vim +++ b/test/old/testdir/shared.vim @@ -110,16 +110,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 |