diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-02 16:20:21 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-08-02 16:52:51 +0200 |
| commit | b5b710b3ae26c6fcc257ace8db94c0ca54340c4e (patch) | |
| tree | b55991e233614d50f2af661e18a9faf9f165a22b /testing/code | |
| parent | 4abf95ba4fe566ef6deb8ef49e3e82cc22fa9252 (diff) | |
| parent | 0d3958e8dec5f78ed19ba5bc7a00a35f3ea3deb0 (diff) | |
| download | pytest-b5b710b3ae26c6fcc257ace8db94c0ca54340c4e.tar.gz | |
Merge master into features
Several conflicts, mostly due to 2c402f4bd.
Conflicts:
.pre-commit-config.yaml
src/_pytest/outcomes.py
src/_pytest/python_api.py
tox.ini
Diffstat (limited to 'testing/code')
| -rw-r--r-- | testing/code/test_excinfo.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py index 76f974957..7742b4da9 100644 --- a/testing/code/test_excinfo.py +++ b/testing/code/test_excinfo.py @@ -378,7 +378,7 @@ def test_excinfo_no_python_sourcecode(tmpdir): excinfo = pytest.raises(ValueError, template.render, h=h) for item in excinfo.traceback: print(item) # XXX: for some reason jinja.Template.render is printed in full - item.source # shouldnt fail + item.source # shouldn't fail if item.path.basename == "test.txt": assert str(item.source) == "{{ h()}}:" |