From ad3aea37c1e8c35f83ddd26cc2b3716e00d99bef Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 20 Feb 2018 00:00:44 +0100
Subject: [PATCH] tests: improve error reporting

Found in some stash, untested.
---
 autoload/neomake.vim   | 4 +++-
 tests/include/init.vim | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/autoload/neomake.vim b/autoload/neomake.vim
index 4dee1abc6b..b592dceca6 100644
--- a/autoload/neomake.vim
+++ b/autoload/neomake.vim
@@ -92,7 +92,9 @@ if s:is_testing
         try
             let r = s:make_info[make_id]
         catch
-            let g:neomake_test_errors += [printf('GetMakeOptions failed: %s (in %s)', v:exception, v:throwpoint)]
+            let msg = printf('GetMakeOptions failed: %s (in %s)', v:exception, v:throwpoint)
+            call vader#log(msg)
+            let g:neomake_test_errors += [msg]
             return {'verbosity': 3}
         endtry
         return r
diff --git a/tests/include/init.vim b/tests/include/init.vim
index 03f8ea76d1..b09f6835db 100644
--- a/tests/include/init.vim
+++ b/tests/include/init.vim
@@ -446,6 +446,11 @@ function! s:After()
   if !empty(actions)
     call add(errors, printf('action_queue is not empty: %d entries: %s',
           \ len(actions), string(status.action_queue)))
+    try
+      call neomake#CancelAllMakes(1)
+    catch
+      call add(errors, v:exception)
+    endtry
   endif
 
   if exists('#neomake_tests')
@@ -513,7 +518,8 @@ function! s:After()
   endif
 
   if !empty(errors)
-    throw len(errors).' error(s) in teardown: '.join(errors, "\n")
+    call map(errors, "printf('%d. %s', v:key+1, v:val)")
+    throw len(errors)." error(s) in teardown:\n".join(errors, "\n")
   endif
 endfunction
 command! NeomakeTestsGlobalAfter call s:After()