More debugging and changing nodeid for comparisons draft
authorDavid Burns <dburns@mozilla.com>
Tue, 05 Dec 2017 12:15:54 +0000
changeset 707526 f43067c1a4c427feacfd7bebfb6ecb100914050d
parent 707525 3a63bb87b43028d898be79d577ffd1178f42a7b8
child 707527 d62f59d79c4b2b2ecd479fd6bfb69a40d73f9fb3
push id92141
push userbmo:dburns@mozilla.com
push dateTue, 05 Dec 2017 12:30:57 +0000
milestone59.0a1
More debugging and changing nodeid for comparisons MozReview-Commit-ID: INVRakDTJgK
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
@@ -347,16 +347,17 @@ class WdspecExecutor(TestExecutor):
         return self.protocol.is_alive
 
     def on_environment_change(self, new_environment):
         pass
 
     def do_test(self, test):
         print("In do_test")
         timeout = test.timeout * self.timeout_multiplier + extra_timeout
+        print "test path is {}".format(test.abs_path)
 
         print("We are about to run tests and check their results...")
         success, data = WdspecRun(self.do_wdspec,
                                   self.protocol.session_config,
                                   test.abs_path,
                                   timeout).run()
         print("We ran some tests!")
         if success:
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
@@ -85,16 +85,17 @@ class HarnessResultRecorder(object):
         self.outcome = (harness_result, None)
 
 
 class SubtestResultRecorder(object):
     def __init__(self):
         self.results = []
 
     def pytest_runtest_logreport(self, report):
+        print "report: {}".format(report.nodeid)
         if report.passed and report.when == "call":
             self.record_pass(report)
         elif report.failed:
             if report.when != "call":
                 self.record_error(report)
             else:
                 self.record_fail(report)
         elif report.skipped:
@@ -115,17 +116,17 @@ class SubtestResultRecorder(object):
     def record_skip(self, report):
         self.record(report.nodeid, "ERROR",
                     "In-test skip decorators are disallowed, "
                     "please use WPT metadata to ignore tests.")
 
     def record(self, test, status, message=None, stack=None):
         if stack is not None:
             stack = str(stack)
-        new_result = (test, status, message, stack)
+        new_result = (test.split("/")[-1], status, message, stack)
         self.results.append(new_result)
 
 
 class TemporaryDirectory(object):
     def __enter__(self):
         self.path = tempfile.mkdtemp(prefix="pytest-")
         return self.path