Bug 690154 - Broken JSON structure when test throws a global exceptio…

…n. r=jhammel
mozilla · Sep 29, 2011 · d99d21c · d99d21c
1 parent dccafce
commit d99d21c
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/mozmill/mozmill/extension/resource/modules/frame.js b/mozmill/mozmill/extension/resource/modules/frame.js
@@ -117,18 +117,21 @@ var loadFile = function(path, collector) {
   }
   try {
     loader.loadSubScript(uri, module, "UTF-8");
-  } catch(e) {
-    events.fail(e);
+  } catch (e) {
+    events.fail({'exception' : e});
+
     var obj = {
-      'filename':path,
-      'passed':false,
-      'failed':true,
-      'passes':0,
-      'fails' :1,
-      'name'  :'Unknown Test',
+      'filename': path,
+      'passed': 0,
+      'failed': 1,
+      'passes': [ ],
+      'fails' : [{'exception' : {
+                     message: e.message,
+                     filename: e.filename,
+                     lineNumber: e.lineNumber}}],
+      'name'  : '<TOP_LEVEL>'
     };
     events.fireEvent('endTest', obj);
-    Components.utils.reportError(e);
   }
 
   module.__file__ = path;