зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1660128 - Set `PYTHONPATH` appropriately in `testing/mochitest/runtests.py` r=ahal
This stamps out an unspoken dependency on `six` in the `mach` `virtualenv`; adding this fixes a bunch of broken tests, namely all those that depend on `pywebsocket_wrapper.py`. Differential Revision: https://phabricator.services.mozilla.com/D87774
This commit is contained in:
Родитель
569ea9f3ad
Коммит
c1a7e97905
|
@ -609,8 +609,10 @@ class WebSocketServer(object):
|
|||
cmd += ['-H', '127.0.0.1', '-p', str(self.port), '-w', self._scriptdir,
|
||||
'-l', os.path.join(self._scriptdir, "websock.log"),
|
||||
'--log-level=debug', '--allow-handlers-outside-root-dir']
|
||||
env = dict(os.environ)
|
||||
env['PYTHONPATH'] = os.pathsep.join(sys.path)
|
||||
# start the process
|
||||
self._process = mozprocess.ProcessHandler(cmd, cwd=SCRIPT_DIR)
|
||||
self._process = mozprocess.ProcessHandler(cmd, cwd=SCRIPT_DIR, env=env)
|
||||
self._process.run()
|
||||
pid = self._process.pid
|
||||
self._log.info("runtests.py | Websocket server pid: %d" % pid)
|
||||
|
|
Загрузка…
Ссылка в новой задаче