p53209761/test_ok2 - test_ok2 - 军科开源项目托管

2 lines

94 B

ReStructuredText

Raw Normal View History

Fix crash when printing while capsysbinary is active Previously, writing to sys.stdout/stderr in text-mode (e.g. `print('foo')`) while a `capsysbinary` fixture is active, would crash with: /usr/lib/python3.7/contextlib.py:119: in __exit__ next(self.gen) E TypeError: write() argument must be str, not bytes This is due to some confusion in the types. The relevant functions are `snap()` and `writeorg()`. The function `snap()` returns what was captured, and the return type should be `bytes` for the binary captures and `str` for the regular ones. The `snap()` return value is eventually passed to `writeorg()` to be written to the original file, so it's input type should correspond to `snap()`. But this was incorrect for `SysCaptureBinary`, which handled it like `str`. To fix this, be explicit in the `snap()` and `writeorg()` implementations, also of the other Capture types. We can't add type annotations yet, because the current inheritance scheme breaks Liskov Substitution and mypy would complain. To be refactored later. Fixes: https://github.com/pytest-dev/pytest/issues/6871 Co-authored-by: Ran Benita (some modifications & commit message)

2020-03-08 09:15:15 +08:00

Fix crash with captured output when using the :fixture:`capsysbinary fixture <capsysbinary>`.