Merge pull request #199 from shadlaws/unit_test_fix_20130310

Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable.

1 files changed, 8 insertions, 3 deletions

diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 3275d741..6b2bf479 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -145,9 +145,14 @@ class Gallery_Unit_Test_Controller extends Controller {
       print $e->getTraceAsString() . "\n";
     }
 
-    $failed = 0;
-    foreach ($unit_test->stats as $class => $stats) {
-      $failed += ($stats["failed"] + $stats["errors"]);
+    if (!isset($unit_test)) {
+      // If an exception is thrown, it's possible that $unit_test was never set.
+      $failed = 1;
+    } else {
+      $failed = 0;
+      foreach ($unit_test->stats as $class => $stats) {
+        $failed += ($stats["failed"] + $stats["errors"]);
+      }
     }
     if (PHP_SAPI == 'cli') {
       exit($failed);