]>
Commit | Line | Data |
---|---|---|
65ffd36d JB |
1 | --- pytest-3.6.3/testing/code/test_excinfo.py.orig 2018-07-04 23:23:50.000000000 +0200 |
2 | +++ pytest-3.6.3/testing/code/test_excinfo.py 2018-07-18 05:46:24.873976914 +0200 | |
3 | @@ -371,7 +371,8 @@ | |
4 | for item in excinfo.traceback: | |
5 | print(item) # XXX: for some reason jinja.Template.render is printed in full | |
6 | item.source # shouldnt fail | |
7 | - if item.path.basename == "test.txt": | |
8 | + from six import string_types | |
9 | + if not isinstance(item.path, string_types) and item.path.basename == "test.txt": | |
10 | assert str(item.source) == "{{ h()}}:" | |
11 | ||
12 | ||
7359165f JB |
13 | --- pytest-4.6.11/testing/acceptance_test.py.orig 2020-06-05 14:09:02.000000000 +0200 |
14 | +++ pytest-4.6.11/testing/acceptance_test.py 2020-09-15 19:53:44.014482984 +0200 | |
15 | @@ -145,6 +145,7 @@ | |
16 | return (DummyDist(entry_points),) | |
17 | ||
18 | monkeypatch.setattr(importlib_metadata, "distributions", my_dists) | |
19 | + monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) | |
20 | params = ("-p", "mycov") if load_cov_early else () | |
21 | testdir.runpytest_inprocess(*params) | |
22 | if load_cov_early: |