From 4e729ed661ec87aa6f9248cf36cdbaee76a041fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= Date: Sun, 13 Dec 2020 08:48:54 +0100 Subject: [PATCH 1/2] Bump Black and Flake8 deps --- Pipfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Pipfile b/Pipfile index f532a51e..800e84c3 100644 --- a/Pipfile +++ b/Pipfile @@ -9,6 +9,7 @@ tox = "*" flake8 = "==3.8.4" # also bump this in .pre-commit-config.yaml black = "==20.8b1" # also bump this in .pre-commit-config.yaml pre-commit = "*" +pytest-rerunfailures = "*" [packages] pytest-html = {editable = true,path = "."} From 481c4cdab50fc882865a50bbd74f31acce4c39b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= Date: Sat, 12 Dec 2020 20:50:28 +0100 Subject: [PATCH 2/2] Handle flaky windows test by rerunning --- testing/test_pytest_html.py | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/test_pytest_html.py b/testing/test_pytest_html.py index 296b353e..3e0c59bf 100644 --- a/testing/test_pytest_html.py +++ b/testing/test_pytest_html.py @@ -186,6 +186,7 @@ def test_fail(self, testdir): assert_results(html, passed=0, failed=1) assert "AssertionError" in html + @pytest.mark.flaky(reruns=2) # test is flaky on windows def test_rerun(self, testdir): testdir.makeconftest( """