Make sure that we always run teardown, even when the test throws an exception

1 files changed, 11 insertions, 2 deletions

diff --git a/modules/unit_test/libraries/Unit_Test.php b/modules/unit_test/libraries/Unit_Test.php
index 43fa2152..a03d725f 100644
--- a/modules/unit_test/libraries/Unit_Test.php
+++ b/modules/unit_test/libraries/Unit_Test.php
@@ -140,8 +140,12 @@ class Unit_Test_Core {
 							$object->setup();
 						}
 
-						// Run the actual test
-						$object->$method_name();
+                                                $e = null;
+						try {
+
+							// Run the actual test
+							$object->$method_name();
+						} catch (Exception $e) { }
 
 						// Run teardown method
 						if ($teardown === TRUE)
@@ -149,6 +153,11 @@ class Unit_Test_Core {
 							$object->teardown();
 						}
 
+                                                if ($e) {
+							throw $e;
+                                                }
+
+
 						$this->stats[$class]['total']++;
 
 						// Test passed