diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-09 12:00:52 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 15:58:17 +0300 |
| commit | 8e1413fed79d1e8036e65228af6c93399ccf5502 (patch) | |
| tree | 502c9df7b2614d20541c7a2d39d390e9a51877cc /contrib/python/pytest/py3/patches | |
| parent | 6b813c17d56d1d05f92c61ddc347d0e4d358fe85 (diff) | |
| download | ydb-8e1413fed79d1e8036e65228af6c93399ccf5502.tar.gz | |
intermediate changes
ref:614ed510ddd3cdf86a8c5dbf19afd113397e0172
Diffstat (limited to 'contrib/python/pytest/py3/patches')
5 files changed, 12 insertions, 12 deletions
diff --git a/contrib/python/pytest/py3/patches/03-limit-id.patch b/contrib/python/pytest/py3/patches/03-limit-id.patch index ba1c199517..f0a57f8599 100644 --- a/contrib/python/pytest/py3/patches/03-limit-id.patch +++ b/contrib/python/pytest/py3/patches/03-limit-id.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/python.py (index) +++ contrib/python/pytest/py3/_pytest/python.py (working tree) -@@ -1192,6 +1192,33 @@ def _idval(val, argname, idx, idfn, item, config): +@@ -1339,6 +1339,33 @@ def _idval(val, argname, idx, idfn, item, config): return str(argname) + str(idx) diff --git a/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch b/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch index c45fd08282..c601f183f9 100644 --- a/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch +++ b/contrib/python/pytest/py3/patches/04-support-cyrillic-id.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/compat.py (index) +++ contrib/python/pytest/py3/_pytest/compat.py (working tree) -@@ -255,7 +255,7 @@ if _PY3: +@@ -233,7 +233,7 @@ if _PY3: if isinstance(val, bytes): ret = _bytes_to_ascii(val) else: diff --git a/contrib/python/pytest/py3/patches/05-support-readline.patch b/contrib/python/pytest/py3/patches/05-support-readline.patch index 11d6b94f0d..0f77979192 100644 --- a/contrib/python/pytest/py3/patches/05-support-readline.patch +++ b/contrib/python/pytest/py3/patches/05-support-readline.patch @@ -1,15 +1,15 @@ --- contrib/python/pytest/py3/_pytest/debugging.py (index) +++ contrib/python/pytest/py3/_pytest/debugging.py (working tree) @@ -1,6 +1,7 @@ from __future__ import absolute_import - """ interactive debugging with PDB, the Python Debugger. """ + """Interactive debugging with PDB, the Python Debugger.""" import argparse import functools +import os import sys - - from _pytest import outcomes -@@ -9,6 +10,42 @@ from _pytest import outcomes - from _pytest.config.exceptions import UsageError + import types + from typing import Any +@@ -29,6 +30,42 @@ from _pytest import outcomes + from _pytest.runner import CallInfo +def import_readline(): @@ -48,10 +48,10 @@ + sys.path = old_sys_path + + - def _validate_usepdb_cls(value): + def _validate_usepdb_cls(value: str) -> Tuple[str, str]: """Validate syntax of --pdbcls option.""" try: -@@ -250,6 +287,7 @@ class pytestPDB(object): +@@ -277,6 +314,7 @@ class pytestPDB(object): @classmethod def set_trace(cls, *args, **kwargs) -> None: """Invoke debugging via ``Pdb.set_trace``, dropping any IO capturing.""" @@ -64,6 +64,6 @@ sys.stdout.write(out) sys.stdout.write(err) + tty() + assert call.excinfo is not None _enter_pdb(node, call.excinfo, report) - def pytest_internalerror(self, excrepr, excinfo): diff --git a/contrib/python/pytest/py3/patches/06-support-ya-markers.patch b/contrib/python/pytest/py3/patches/06-support-ya-markers.patch index 373d89c866..0726477fe8 100644 --- a/contrib/python/pytest/py3/patches/06-support-ya-markers.patch +++ b/contrib/python/pytest/py3/patches/06-support-ya-markers.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/mark/structures.py (index) +++ contrib/python/pytest/py3/_pytest/mark/structures.py (working tree) -@@ -326,7 +326,10 @@ class MarkGenerator(object): +@@ -490,7 +490,10 @@ class MarkGenerator(object): # example lines: "skipif(condition): skip the given test if..." # or "hypothesis: tests which use Hypothesis", so to get the # marker name we split on both `:` and `(`. diff --git a/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch b/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch index 1d0b80c6d4..dd81a883e8 100644 --- a/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch +++ b/contrib/python/pytest/py3/patches/07-disable-translate-non-printable.patch @@ -1,6 +1,6 @@ --- contrib/python/pytest/py3/_pytest/compat.py (index) +++ contrib/python/pytest/py3/_pytest/compat.py (working tree) -@@ -256,7 +256,7 @@ if _PY3: +@@ -234,7 +234,7 @@ if _PY3: ret = _bytes_to_ascii(val) else: ret = val |