mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	patch 9.0.0369: a failing flaky test doesn't mention the time
Problem: A failing flaky test doesn't mention the time. Solution: Add the time for debugging. Improve error message.
This commit is contained in:
		| @@ -465,6 +465,7 @@ for g:testfunc in sort(s:tests) | |||||||
|   " A test can set g:test_is_flaky to retry running the test. |   " A test can set g:test_is_flaky to retry running the test. | ||||||
|   let g:test_is_flaky = 0 |   let g:test_is_flaky = 0 | ||||||
|  |  | ||||||
|  |   let starttime = strftime("%T") | ||||||
|   call RunTheTest(g:testfunc) |   call RunTheTest(g:testfunc) | ||||||
|  |  | ||||||
|   " Repeat a flaky test.  Give up when: |   " Repeat a flaky test.  Give up when: | ||||||
| @@ -475,10 +476,10 @@ for g:testfunc in sort(s:tests) | |||||||
|         \ && $TEST_NO_RETRY == '' |         \ && $TEST_NO_RETRY == '' | ||||||
|         \ && g:test_is_flaky |         \ && g:test_is_flaky | ||||||
|     while 1 |     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 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) |       call extend(total_errors, v:errors) | ||||||
|  |  | ||||||
|       if g:run_nr >= 5 || prev_error == v:errors[0] |       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 v:errors = [] | ||||||
|       let g:run_nr += 1 |       let g:run_nr += 1 | ||||||
|  |  | ||||||
|  |       let starttime = strftime("%T") | ||||||
|       call RunTheTest(g:testfunc) |       call RunTheTest(g:testfunc) | ||||||
|  |  | ||||||
|       if len(v:errors) == 0 |       if len(v:errors) == 0 | ||||||
|   | |||||||
| @@ -98,16 +98,16 @@ func RunServer(cmd, testfunc, args) | |||||||
|   try |   try | ||||||
|     let g:currentJob = RunCommand(pycmd) |     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() |     let port = GetPort() | ||||||
|     if port == 0 |     if port == 0 | ||||||
|       call assert_false(1, "Can't start " . a:cmd) |       call assert_report(strftime("%T") .. " Can't start " .. a:cmd) | ||||||
|       return |       return | ||||||
|     endif |     endif | ||||||
|  |  | ||||||
|     call call(function(a:testfunc), [port]) |     call call(function(a:testfunc), [port]) | ||||||
|   catch |   catch | ||||||
|     call assert_false(1, 'Caught exception: "' . v:exception . '" in ' . v:throwpoint) |     call assert_report('Caught exception: "' . v:exception . '" in ' . v:throwpoint) | ||||||
|   finally |   finally | ||||||
|     call s:kill_server(a:cmd) |     call s:kill_server(a:cmd) | ||||||
|   endtry |   endtry | ||||||
|   | |||||||
| @@ -707,6 +707,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     369, | ||||||
| /**/ | /**/ | ||||||
|     368, |     368, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user