nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1679442 - Fix handling of missing assertion count, r=whimboo

Browse source 
This doesn't work in Py3 because we can't compare an int with None. If
the count is None we don't want to log anything, so just check for that.

Differential Revision: https://phabricator.services.mozilla.com/D98018
This commit is contained in:
James Graham 2020-11-26 20:42:10 +00:00
parent eaa6d5669b
commit 290d475767
2 changed files with 4 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
View file

@ -956,7 +956,8 @@ class MarionetteRefTestExecutor(RefTestExecutor):
assertion_count = self.protocol.asserts.get()
if "extra" not in result:
result["extra"] = {}
result["extra"]["assertion_count"] = assertion_count
if assertion_count is not None:
result["extra"]["assertion_count"] = assertion_count
return self.convert_result(test, result)

4
testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
View file

@ -664,8 +664,8 @@ class TestRunnerManager(threading.Thread):
self.logger.debug("Unexpected count in this thread %i" % self.unexpected_count)
if "assertion_count" in file_result.extra:
assertion_count = file_result.extra.pop("assertion_count")
if assertion_count > 0:
assertion_count = file_result.extra["assertion_count"]
if assertion_count is not None and assertion_count > 0:
self.logger.assertion_count(test.id,
int(assertion_count),
test.min_assertion_count,