Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 12:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 6568853848ac (bug 1495601) on request from jgraham for causing issues with mozinfo.json. a=backout

Browse Source
This commit is contained in:
Cosmin Sabou 2018-10-04 01:06:30 +03:00
parent 7244d89e06
commit f972f1d4b5
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/tests/jstests.py
View File

@ -354,10 +354,8 @@ def load_wpt_tests(requested_paths, excluded_paths, debug, wasm):
meta_filters=[filter_jsshell_tests]).load()
run_info_extras = products.load_product(kwargs["config"], "firefox")[-1](**kwargs)
is_automation = os.environ.get('AUTOMATION', False)
run_info = wpttest.get_run_info(kwargs["metadata_root"], "firefox",
debug=debug, extras=run_info_extras,
raise_exception=is_automation)
debug=debug, extras=run_info_extras)
path_filter = testloader.TestFilter(test_manifests,
include=requested_paths,

9
testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
View File

@ -71,10 +71,9 @@ class RunInfo(dict):
browser_version=None,
browser_channel=None,
verify=None,
extras=None,
raise_exception=True):
extras=None):
import mozinfo
self._update_mozinfo(metadata_root, raise_exception=raise_exception)
self._update_mozinfo(metadata_root)
self.update(mozinfo.info)
from update.tree import GitTree
@ -103,7 +102,7 @@ class RunInfo(dict):
if extras is not None:
self.update(extras)
def _update_mozinfo(self, metadata_root, **kwargs):
def _update_mozinfo(self, metadata_root):
"""Add extra build information from a mozinfo.json file in a parent
directory"""
import mozinfo
@ -116,7 +115,7 @@ class RunInfo(dict):
dirs.add(str(path))
path = os.path.split(path)[0]
mozinfo.find_and_update_from_json(*dirs, **kwargs)
mozinfo.find_and_update_from_json(*dirs)
class Test(object):