Bug 1452952 - Fix prefs getter call in wptrunner Firefox executor, r=ato
authorJames Graham <james@hoppipolla.co.uk>
Tue, 10 Apr 2018 14:33:31 +0100
changeset 467345 55b99481fab156381335b6887fca26b6a8f0c0b3
parent 467344 61159a96c9a53ca6dff67e251bc595068404b496
child 467346 13b5bbdaacc979f698f05ff9de0e01e0bddfe765
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1452952
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1452952 - Fix prefs getter call in wptrunner Firefox executor, r=ato MozReview-Commit-ID: BEU8bpH4CVg
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -398,17 +398,17 @@ class MarionetteProtocol(Protocol):
         for name in old_environment.get("prefs", {}).iterkeys():
             value = self.executor.original_pref_values[name]
             if value is None:
                 self.prefs.clear(name)
             else:
                 self.prefs.set(name, value)
 
         for name, value in new_environment.get("prefs", {}).iteritems():
-            self.executor.original_pref_values[name] = self.get_pref(name)
+            self.executor.original_pref_values[name] = self.prefs.get(name)
             self.prefs.set(name, value)
 
 
 class ExecuteAsyncScriptRun(object):
     def __init__(self, logger, func, protocol, url, timeout):
         self.logger = logger
         self.result = (None, None)
         self.protocol = protocol