forked from mirrors/gecko-dev
02a7b4ebdf
Allow-list all Python code in tree for use with the black linter, and re-format all code in-tree accordingly. To produce this patch I did all of the following: 1. Make changes to tools/lint/black.yml to remove include: stanza and update list of source extensions. 2. Run ./mach lint --linter black --fix 3. Make some ad-hoc manual updates to python/mozbuild/mozbuild/test/configure/test_configure.py -- it has some hard-coded line numbers that the reformat breaks. 4. Make some ad-hoc manual updates to `testing/marionette/client/setup.py`, `testing/marionette/harness/setup.py`, and `testing/firefox-ui/harness/setup.py`, which have hard-coded regexes that break after the reformat. 5. Add a set of exclusions to black.yml. These will be deleted in a follow-up bug (1672023). # ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D94045
58 lines
1.7 KiB
Python
58 lines
1.7 KiB
Python
# 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/.
|
|
|
|
"""Functions for running commands"""
|
|
|
|
from __future__ import absolute_import, print_function
|
|
|
|
import subprocess
|
|
import os
|
|
import time
|
|
import logging
|
|
import six
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
# timeout message, used in TRANSIENT_HG_ERRORS and in tests.
|
|
TERMINATED_PROCESS_MSG = "timeout, process terminated"
|
|
|
|
|
|
def log_cmd(cmd, **kwargs):
|
|
# cwd is special in that we always want it printed, even if it's not
|
|
# explicitly chosen
|
|
kwargs = kwargs.copy()
|
|
if "cwd" not in kwargs:
|
|
kwargs["cwd"] = os.getcwd()
|
|
log.info("command: START")
|
|
log.info("command: %s" % subprocess.list2cmdline(cmd))
|
|
for key, value in six.iteritems(kwargs):
|
|
log.info("command: %s: %s", key, str(value))
|
|
|
|
|
|
def merge_env(env):
|
|
new_env = os.environ.copy()
|
|
new_env.update(env)
|
|
return new_env
|
|
|
|
|
|
def run_cmd(cmd, **kwargs):
|
|
"""Run cmd (a list of arguments). Raise subprocess.CalledProcessError if
|
|
the command exits with non-zero. If the command returns successfully,
|
|
return 0."""
|
|
log_cmd(cmd, **kwargs)
|
|
# We update this after logging because we don't want all of the inherited
|
|
# env vars muddling up the output
|
|
if "env" in kwargs:
|
|
kwargs["env"] = merge_env(kwargs["env"])
|
|
try:
|
|
t = time.time()
|
|
log.info("command: output:")
|
|
return subprocess.check_call(cmd, **kwargs)
|
|
except subprocess.CalledProcessError:
|
|
log.info("command: ERROR", exc_info=True)
|
|
raise
|
|
finally:
|
|
elapsed = time.time() - t
|
|
log.info("command: END (%.2fs elapsed)\n", elapsed)
|