Ensure @teardown function is run when a test fails or errors

Author: molovo

src/commands/run.zsh

@@ -77,14 +77,22 @@ function _zunit_execute_test() {
       # and the error will be reported back to the test runner
       setopt ERR_EXIT
 
+      # Add an exit handler which calls the teardown function if it is
+      # defined and the test exits early
+      if (( \$+functions[__zunit_test_teardown] )); then
+        zshexit() {
+          __zunit_test_teardown >/dev/null 2>&1
+        }
+      fi
+
       # Create some local variables to store test state in
       integer _zunit_assertion_count=0
       integer state
       local output
       typeset -a lines
 
       # If a setup function is defined, run it now
-      if (( $+functions[__zunit_test_setup] )); then
+      if (( \$+functions[__zunit_test_setup] )); then
         __zunit_test_setup >/dev/null 2>&1
       fi
 
@@ -93,10 +101,13 @@ function _zunit_execute_test() {
       ${body}
 
       # If a teardown function is defined, run it now
-      if (( $+functions[__zunit_test_teardown] )); then
+      if (( \$+functions[__zunit_test_teardown] )); then
         __zunit_test_teardown >/dev/null 2>&1
       fi
 
+      # Remove the error handler
+      zshexit() {}
+
       # Check the assertion count, and if it is 0, return
       # the warning exit code
       [[ \$_zunit_assertion_count -gt 0 ]] || return 248
@@ -127,7 +138,6 @@ function _zunit_execute_test() {
       return 126
     fi
 
-
     # Check if a time limit has been specified. We only do this if
     # the ZSH version is at least 5.1.0, since older versions of ZSH
     # are unable to handle asynchronous processes in the way we need

tests/run.zunit

@@ -1,13 +1,5 @@
 #!/usr/bin/env zunit
 
-@setup {
-  echo 'Testing setup method'
-}
-
-@teardown {
-  echo 'Testing teardown method'
-}
-
 @test 'Test successful command' {
   run return 0