diff options
Diffstat (limited to 'src/tox')
| -rw-r--r-- | src/tox/pytest.py | 4 | ||||
| -rw-r--r-- | src/tox/tox_env/api.py | 20 | ||||
| -rw-r--r-- | src/tox/tox_env/python/api.py | 5 |
3 files changed, 18 insertions, 11 deletions
diff --git a/src/tox/pytest.py b/src/tox/pytest.py index a5bdd508..f3c89b9e 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -335,13 +335,13 @@ class ToxRunOutcome: if dedent: out = textwrap.dedent(out).lstrip() if regex: - self.matches(out, self.out, re.MULTILINE) + self.matches(out, self.out, re.MULTILINE | re.DOTALL) else: assert self.out == out if dedent: err = textwrap.dedent(err).lstrip() if regex: - self.matches(err, self.err, re.MULTILINE) + self.matches(err, self.err, re.MULTILINE | re.DOTALL) else: assert self.err == err diff --git a/src/tox/tox_env/api.py b/src/tox/tox_env/api.py index 1ba40a17..e993f02f 100644 --- a/src/tox/tox_env/api.py +++ b/src/tox/tox_env/api.py @@ -117,21 +117,29 @@ class ToxEnv(ABC): def default_pass_env(self) -> List[str]: env = [ - "https_proxy", - "http_proxy", - "no_proxy", + "https_proxy", # HTTP proxy configuration + "http_proxy", # HTTP proxy configuration + "no_proxy", # HTTP proxy configuration + "LANG", # localication + "LANGUAGE", # localication + "CURL_CA_BUNDLE", # curl certificates + "SSL_CERT_FILE", # https certificates + "LD_LIBRARY_PATH", # location of libs ] if sys.stdout.isatty(): # if we're on a interactive shell pass on the TERM env.append("TERM") if sys.platform == "win32": # pragma: win32 cover env.extend( [ - "TEMP", - "TMP", + "TEMP", # temporary file location + "TMP", # temporary file location + "USERPROFILE", # needed for `os.path.expanduser()` + "PATHEXT", # needed for discovering executables + "MSYSTEM", # controls paths printed format ] ) else: # pragma: win32 no cover - env.append("TMPDIR") + env.append("TMPDIR") # temporary file location return env def setup(self) -> None: diff --git a/src/tox/tox_env/python/api.py b/src/tox/tox_env/python/api.py index ed7dd27d..2e85c951 100644 --- a/src/tox/tox_env/python/api.py +++ b/src/tox/tox_env/python/api.py @@ -98,14 +98,13 @@ class Python(ToxEnv, ABC): if sys.platform == "win32": # pragma: win32 cover env.extend( [ + "SYSTEMDRIVE", "SYSTEMROOT", # needed for python's crypto module - "PATHEXT", # needed for discovering executables "COMSPEC", # needed for distutils cygwin compiler "PROCESSOR_ARCHITECTURE", # platform.machine() - "USERPROFILE", # needed for `os.path.expanduser()` - "MSYSTEM", # controls paths printed format ] ) + env.extend(["REQUESTS_CA_BUNDLE"]) return env def default_base_python(self, conf: "Config", env_name: Optional[str]) -> List[str]: |