Bug 1160085 - Update to latest wptrunner, a=testonly
authorJames Graham <james@hoppipolla.co.uk>
Thu, 30 Apr 2015 11:26:56 +0100
changeset 241782 1f42bc6b4b8c3177798b38ede9478f3b9fe2f584
parent 241781 469ae46092fcaff123de2b291dddd107155f88c9
child 241783 ef0857b200ae114fd64199fc21ab83ba929cb280
push id28669
push userryanvm@gmail.com
push dateThu, 30 Apr 2015 17:57:05 +0000
treeherdermozilla-central@7723b15ea695 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1160085
milestone40.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 1160085 - Update to latest wptrunner, a=testonly
testing/web-platform/harness/wptrunner/executors/executormarionette.py
testing/web-platform/harness/wptrunner/executors/executorservo.py
--- a/testing/web-platform/harness/wptrunner/executors/executormarionette.py
+++ b/testing/web-platform/harness/wptrunner/executors/executormarionette.py
@@ -152,30 +152,29 @@ class MarionetteProtocol(Protocol):
 
     def set_pref(self, name, value):
         self.logger.info("Setting pref %s (%s)" % (name, value))
         self.marionette.set_context(self.marionette.CONTEXT_CHROME)
         script = """
             let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
                                           .getService(Components.interfaces.nsIPrefBranch);
             let pref = '%s';
-            let value = '%s';
             let type = prefInterface.getPrefType(pref);
             switch(type) {
                 case prefInterface.PREF_STRING:
-                    prefInterface.setCharPref(pref, value);
+                    prefInterface.setCharPref(pref, '%s');
                     break;
                 case prefInterface.PREF_BOOL:
-                    prefInterface.setBoolPref(pref, value);
+                    prefInterface.setBoolPref(pref, %s);
                     break;
                 case prefInterface.PREF_INT:
-                    prefInterface.setIntPref(pref, value);
+                    prefInterface.setIntPref(pref, %s);
                     break;
             }
-            """ % (name, value)
+            """ % (name, value, value, value)
         self.marionette.execute_script(script)
         self.marionette.set_context(self.marionette.CONTEXT_CONTENT)
 
     def clear_user_pref(self, name):
         self.logger.info("Clearing pref %s" % (name))
         self.marionette.set_context(self.marionette.CONTEXT_CHROME)
         script = """
             let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
--- a/testing/web-platform/harness/wptrunner/executors/executorservo.py
+++ b/testing/web-platform/harness/wptrunner/executors/executorservo.py
@@ -181,17 +181,18 @@ class ServoRefTestExecutor(ProcessTestEx
         os.rmdir(self.tempdir)
         ProcessTestExecutor.teardown(self)
 
     def screenshot(self, test):
         full_url = self.test_url(test)
 
         with TempFilename(self.tempdir) as output_path:
             self.command = [self.binary, "--cpu", "--hard-fail", "--exit",
-                            "--output=%s" % output_path, full_url]
+                            "-Z", "disable-text-aa", "--output=%s" % output_path,
+                            full_url]
 
             env = os.environ.copy()
             env["HOST_FILE"] = self.hosts_path
 
             self.proc = ProcessHandler(self.command,
                                        processOutputLine=[self.on_output],
                                        env=env)