Merge pull request #88 from w3c/jgraham/stack_trace

Log the stack trace for failures, where available
web-platform-tests · Mar 13, 2015 · 421ca30 · 421ca30
2 parents cd49e9e + f681f9b
commit 421ca30
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/wptrunner/executors/base.py b/wptrunner/executors/base.py
@@ -60,7 +60,7 @@ def __call__(self, test, result):
         harness_result = test.result_cls(self.harness_codes[result["status"]], result["message"])
         return (harness_result,
                 [test.subtest_result_cls(subtest["name"], self.test_codes[subtest["status"]],
-                                         subtest["message"]) for subtest in result["tests"]])
+                                         subtest["message"], subtest.get("stack", None)) for subtest in result["tests"]])
 testharness_result_converter = TestharnessResultConverter()
 
 

diff --git a/wptrunner/executors/testharness_marionette.js b/wptrunner/executors/testharness_marionette.js
@@ -8,12 +8,13 @@ window.wrappedJSObject.explicit_timeout = %(explicit_timeout)d;
 window.wrappedJSObject.done = function(tests, status) {
   clearTimeout(timer);
   var test_results = tests.map(function(x) {
-    return {name:x.name, status:x.status, message:x.message}
+    return {name:x.name, status:x.status, message:x.message, stack:x.stack}
   });
   marionetteScriptFinished({test:"%(url)s",
                             tests:test_results,
                             status: status.status,
-                            message: status.message});
+                            message: status.message,
+                            stack: status.stack});
 }
 
 window.wrappedJSObject.win = window.open("%(abs_url)s", "%(window_id)s");

diff --git a/wptrunner/executors/testharness_webdriver.js b/wptrunner/executors/testharness_webdriver.js
@@ -8,12 +8,13 @@ window.timeout_multiplier = %(timeout_multiplier)d;
 window.done = function(tests, status) {
   clearTimeout(timer);
   var test_results = tests.map(function(x) {
-    return {name:x.name, status:x.status, message:x.message}
+    return {name:x.name, status:x.status, message:x.message, stack:x.stack}
   });
   callback({test:"%(url)s",
             tests:test_results,
             status: status.status,
-            message: status.message});
+            message: status.message,
+            stack: status.stack});
 }
 
 window.win = window.open("%(abs_url)s", "%(window_id)s");

diff --git a/wptrunner/testharnessreport-servo.js b/wptrunner/testharnessreport-servo.js
@@ -9,9 +9,10 @@ setup(props);
 add_completion_callback(function (tests, harness_status) {
     alert("RESULT: " + JSON.stringify({
         tests: tests.map(function(t) {
-            return { name: t.name, status: t.status, message: t.message }
+            return { name: t.name, status: t.status, message: t.message, stack: t.stack}
         }),
         status: harness_status.status,
         message: harness_status.message,
+        stack: harness_status.stack,
     }));
 });
diff --git a/wptrunner/testrunner.py b/wptrunner/testrunner.py
@@ -498,7 +498,8 @@ def test_ended(self, test, results):
                                     result.name,
                                     result.status,
                                     message=result.message,
-                                    expected=expected)
+                                    expected=expected,
+                                    stack=result.stack)
 
         # TODO: consider changing result if there is a crash dump file
 

diff --git a/wptrunner/wpttest.py b/wptrunner/wpttest.py
@@ -21,12 +21,13 @@ def __init__(self, status, message, expected=None, extra=None):
 
 
 class SubtestResult(object):
-    def __init__(self, name, status, message, expected=None):
+    def __init__(self, name, status, message, stack=None, expected=None):
         self.name = name
         if status not in self.statuses:
             raise ValueError("Unrecognised status %s" % status)
         self.status = status
         self.message = message
+        self.stack = stack
         self.expected = expected