Backed out changeset 6568853848ac (bug 1495601) on request from jgraham for causing issues with mozinfo.json. a=backout
authorCosmin Sabou <csabou@mozilla.com>
Thu, 04 Oct 2018 01:06:30 +0300
changeset 495192 317b91c1fbd5
parent 495191 520bcd79bd20
child 495193 65fc22a1627b
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1495601
milestone64.0a1
backs out6568853848ac
first release with
nightly linux32
317b91c1fbd5 / 64.0a1 / 20181003223518 / files
nightly linux64
317b91c1fbd5 / 64.0a1 / 20181003223518 / files
nightly mac
317b91c1fbd5 / 64.0a1 / 20181003223518 / files
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
Backed out changeset 6568853848ac (bug 1495601) on request from jgraham for causing issues with mozinfo.json. a=backout
js/src/tests/jstests.py
testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
--- a/js/src/tests/jstests.py
+++ b/js/src/tests/jstests.py
@@ -349,20 +349,18 @@ def load_wpt_tests(requested_paths, excl
         for test in it:
             if test[1].get("jsshell"):
                 yield test
 
     test_manifests = testloader.ManifestLoader(test_paths, types=["testharness"],
                                                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,
                                         exclude=excluded_paths)
     loader = testloader.TestLoader(test_manifests,
                                    ["testharness"],
                                    run_info,
                                    manifest_filters=[path_filter])
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
@@ -66,20 +66,19 @@ def get_run_info(metadata_root, product,
     return RunInfo(metadata_root, product, **kwargs)
 
 
 class RunInfo(dict):
     def __init__(self, metadata_root, product, debug,
                  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
         try:
             # GitTree.__init__ throws if we are not in a git tree.
             rev = GitTree(log_error=False).rev
         except (OSError, subprocess.CalledProcessError):
             rev = None
@@ -98,30 +97,30 @@ class RunInfo(dict):
             self["browser_channel"] = browser_channel
 
         self["verify"] = verify
         if "wasm" not in self:
             self["wasm"] = False
         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
 
         path = metadata_root
         dirs = set()
         while path != os.path.expanduser('~'):
             if path in dirs:
                 break
             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):
 
     result_cls = None
     subtest_result_cls = None
     test_type = None