Sisyphus|JavaScript Tests - Spider's userhook can be stopped by exceptions in tests, bug 428391

js/tests/userhookeach.js

@@ -51,18 +51,25 @@ var gPageStop;
 
 function userOnStart()
 {
+  try
+  {
     dlog('userOnStart');
     cdump('JavaScriptTest: Begin Run');
     registerDialogCloser();
+  }
+  catch(ex)
+  {
+    cdump('Spider: FATAL ERROR: userOnStart: ' + ex);
+  }
 }
 
 function userOnBeforePage()
 {
+  try
+  {
     dlog('userOnBeforePage');
     gPageStart = new Date();
 
-  try
-  {
     gCurrentTestId = /test=(.*);language/.exec(gSpider.mCurrentUrl.mUrl)[1];
     gCurrentTestValid = true;
     cdump('JavaScriptTest: Begin Test ' + gCurrentTestId);
@@ -70,7 +77,7 @@ function userOnBeforePage()
   }
   catch(ex)
   {
-    cdump('userOnBeforePage: ' + ex);
+    cdump('Spider: WARNING ERROR: userOnBeforePage: ' + ex);
     gCurrentTestValid = false;
     gPageCompleted = true;
   }
@@ -78,19 +85,35 @@ function userOnBeforePage()
 
 function userOnAfterPage()
 {
+  try
+  {
     dlog('userOnAfterPage');
     gPageStop = new Date();
 
     cdump(gSpider.mCurrentUrl.mUrl + ': PAGE STATUS: NORMAL (' + ((gPageStop - gPageStart)/1000).toFixed(0) + ' seconds)');
     checkTestCompleted();
+  }
+  catch(ex)
+  {
+    cdump('Spider: WARNING ERROR: userOnAfterPage: ' + ex);
+    gCurrentTestValid = false;
+    gPageCompleted = true;
+  }
 }
 
 function userOnStop()
 {
+  try
+  {
     // close any pending dialogs
     cdump('JavaScriptTest: End Run');
     closeDialog();
     unregisterDialogCloser();
+  }
+  catch(ex)
+  {
+    cdump('Spider: WARNING ERROR: userOnStop: ' + ex);
+  }
 }
 
 function userOnPageTimeout()
@@ -111,7 +134,7 @@ function userOnPageTimeout()
     }
     catch(ex)
     {
-      cdump('userOnPageTimeout: ' + ex);
+      cdump('Spider: WARNING ERROR: userOnPageTimeout: ' + ex);
     }
   }
   cdump('JavaScriptTest: End Test ' + gCurrentTestId);
@@ -119,6 +142,8 @@ function userOnPageTimeout()
 
 function checkTestCompleted()
 {
+  try
+  {
     dlog('checkTestCompleted()');
 
     var win = gSpider.mDocument.defaultView;
@@ -165,7 +190,12 @@ function checkTestCompleted()
       dlog('page not completed, recheck');
       setTimeout(checkTestCompleted, gCheckInterval);
     }
- 
+  }
+  catch(ex)
+  {
+    cdump('Spider: WARNING ERROR: checkTestCompleted: ' + ex);
+    gPageCompleted = true;
+  } 
 }
 
 gConsoleListener.onConsoleMessage =