Permalink
Browse files

patch 8.0.0088

Problem:    When a test fails in Setup or Teardown the problem is not reported.
Solution:   Add a try/catch. (Hirohito Higashi)
  • Loading branch information...
1 parent 7df915d commit cc28e2d05d05552d8b72a520be8a193f3d9822d4 @brammool brammool committed Nov 17, 2016
Showing with 14 additions and 2 deletions.
  1. +12 −2 src/testdir/runtest.vim
  2. +2 −0 src/version.c
@@ -89,7 +89,11 @@ endfunc
function RunTheTest(test)
echo 'Executing ' . a:test
if exists("*SetUp")
- call SetUp()
+ try
+ call SetUp()
+ catch
+ call add(v:errors, 'Caught exception in SetUp() before ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
+ endtry
endif
call add(s:messages, 'Executing ' . a:test)
@@ -104,7 +108,11 @@ function RunTheTest(test)
endtry
if exists("*TearDown")
- call TearDown()
+ try
+ call TearDown()
+ catch
+ call add(v:errors, 'Caught exception in TearDown() after ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
+ endtry
endif
" Close any extra windows and make the current one not modified.
@@ -221,3 +229,5 @@ call append(line('$'), s:messages)
write
qall!
+
+" vim: shiftwidth=2 sts=2 expandtab
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 88,
+/**/
87,
/**/
86,

0 comments on commit cc28e2d

Please sign in to comment.