Bug 1163709 - Update to latest wptrunner, a=testonly
authorJames Graham <james@hoppipolla.co.uk>
Mon, 11 May 2015 19:18:33 +0100
changeset 243410 79630cdf61aac76223b47e87e2a6ca419bf3c194
parent 243409 ed9733797a3116fff8f62f489c84aaaa2e2ecc8c
child 243411 cb4b66d730b3f517f786af925f36b84d78c3672d
push id28738
push usercbook@mozilla.com
push dateTue, 12 May 2015 14:11:31 +0000
treeherdermozilla-central@bedce1b405a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1163709
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 1163709 - Update to latest wptrunner, a=testonly
testing/web-platform/harness/wptrunner/browsers/firefox.py
--- a/testing/web-platform/harness/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/harness/wptrunner/browsers/firefox.py
@@ -1,14 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import subprocess
+import sys
 
 import mozinfo
 from mozprocess import ProcessHandler
 from mozprofile import FirefoxProfile, Preferences
 from mozprofile.permissions import ServerLocations
 from mozrunner import FirefoxRunner
 from mozcrash import mozcrash
 
@@ -186,17 +187,18 @@ class FirefoxBrowser(Browser):
             env_var = "DYLD_LIBRARY_PATH"
         elif mozinfo.isUnix:
             env_var = "LD_LIBRARY_PATH"
         else:
             env_var = "PATH"
 
 
         env[env_var] = (os.path.pathsep.join([certutil_dir, env[env_var]])
-                        if env_var in env else certutil_dir)
+                        if env_var in env else certutil_dir).encode(
+                                sys.getfilesystemencoding() or 'utf-8', 'replace')
 
         def certutil(*args):
             cmd = [self.certutil_binary] + list(args)
             self.logger.process_output("certutil",
                                        subprocess.check_output(cmd,
                                                                env=env,
                                                                stderr=subprocess.STDOUT),
                                        " ".join(cmd))