Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 35ee729f6f1e (bug 1295699) for flake8 test failure

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-01-23 15:09:57 +01:00
parent 5da33996e2
commit e992f5d4fe
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
testing/mozbase/mozrunner/mozrunner/base/runner.py
View File

@ -7,7 +7,6 @@ from abc import ABCMeta, abstractproperty
import os
import subprocess
import traceback
import sys
from mozlog import get_default_logger
from mozprocess import ProcessHandler
@ -19,10 +18,6 @@ except ImportError:
from ..application import DefaultContext
from ..errors import RunnerNotStartedError
if sys.version_info[0] < 3:
unicode_type = unicode
else:
unicode_type = str
class BaseRunner(object):
"""
@ -109,16 +104,7 @@ class BaseRunner(object):
if self.logger:
self.logger.info('Application command: %s' % ' '.join(cmd))
if interactive:
filtered_env = {}
for k in self.env:
v = self.env[k]
if isinstance(v, unicode_type):
v = v.encode('utf-8')
if isinstance(k, unicode_type):
k = k.encode('utf-8')
filtered_env[k] = v
self.process_handler = subprocess.Popen(cmd, env=filtered_env)
self.process_handler = subprocess.Popen(cmd, env=self.env)
# TODO: other arguments
else:
# this run uses the managed processhandler