diff --git a/test/requirements/pypi.in b/test/requirements/pypi.in index ebd6c51a..17e755ec 100644 --- a/test/requirements/pypi.in +++ b/test/requirements/pypi.in @@ -2,7 +2,7 @@ pytest~=7.4.0 pytest-xdist[psutil,setproctitle]~=3.3.1 -pytest-html~=3.2.0 +pytest-html~=4.0.0 pytest-rerunfailures~=12.0 pluggy~=1.3.0 ansi2html~=1.8.0 diff --git a/test/requirements/pypi.txt b/test/requirements/pypi.txt index 95de92e5..7031a322 100644 --- a/test/requirements/pypi.txt +++ b/test/requirements/pypi.txt @@ -16,6 +16,10 @@ filelock==3.12.3 # via -r pypi.in iniconfig==2.0.0 # via pytest +jinja2==3.1.2 + # via pytest-html +markupsafe==2.1.3 + # via jinja2 packaging==23.1 # via # pytest @@ -26,8 +30,6 @@ pluggy==1.3.0 # pytest psutil==5.9.5 # via pytest-xdist -py==1.11.0 - # via pytest-html pytest==7.4.1 # via # -r pypi.in @@ -35,7 +37,7 @@ pytest==7.4.1 # pytest-metadata # pytest-rerunfailures # pytest-xdist -pytest-html==3.2.0 +pytest-html==4.0.0 # via -r pypi.in pytest-metadata==3.0.0 # via pytest-html diff --git a/test/screenshot.py b/test/screenshot.py index 2c7d033b..9aac8845 100644 --- a/test/screenshot.py +++ b/test/screenshot.py @@ -77,13 +77,13 @@ def pytest_runtest_makereport(self, item, call): png_blob = screenshot(self.display) - extra = getattr(report, 'extra', []) + extras = getattr(report, 'extras', []) - extra.append( + extras.append( pytest_html.extras.png(base64.b64encode(png_blob).decode('ascii')) ) - report.extra = extra + report.extras = extras def pytest_addoption(parser): diff --git a/test/tox.ini b/test/tox.ini index 83994eeb..0d130e82 100644 --- a/test/tox.ini +++ b/test/tox.ini @@ -11,11 +11,6 @@ passenv = deps = -r requirements.txt -# https://github.com/pytest-dev/pytest/issues/10451 -commands_pre = - rm -f {envsitepackagesdir}/py.py -allowlist_externals = rm - commands = python -m pytest -c {toxinidir}/pytest.ini --html=report.html --dist=worksteal {posargs: -n auto --screenshot-failing-only} suicide_timeout = 10