Update test.rb

Also fix earlier setup and teardown to support abort_on_exception
BallAerospace · Nov 22, 2019 · 2bd9275 · 2bd9275
1 parent 5f2b081
commit 2bd9275
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/cosmos/tools/test_runner/test.rb b/lib/cosmos/tools/test_runner/test.rb
@@ -126,7 +126,7 @@ def run
       if result
         results << result
         yield result if block_given?
-        raise StopScript if result.stopped
+        raise StopScript if (results[-1].exceptions and @@abort_on_exception) or results[-1].stopped
       end
 
       # Run each test case
@@ -141,7 +141,7 @@ def run
       if result
         results << result
         yield result if block_given?
-        raise StopScript if result.stopped
+        raise StopScript if (results[-1].exceptions and @@abort_on_exception) or results[-1].stopped
       end
 
       results