From 1fbb624dcb853e7ce9ea23ffaa48284ae29a342e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= <jim.brannlund@gmail.com>
Date: Sat, 16 Jul 2022 01:09:26 +0200
Subject: [PATCH] Disable pypy3.8 on windows

---
 .github/workflows/tests.yml |  7 ++++---
 testing/test_pytest_html.py | 25 -------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 68542d27..c914d2fe 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,9 +63,10 @@ jobs:
             name: pypy3-ubuntu
             python-version: pypy-3.8
 
-          - os: windows-latest
-            name: pypy3-windows
-            python-version: pypy-3.8
+          # TODO: This test takes 10(!) times as long as the regular py38 on Windows
+#          - os: windows-latest
+#            name: pypy3-windows
+#            python-version: pypy-3.8
 
            # https://github.com/pytest-dev/pytest-html/issues/482
           - os: macOS-latest
diff --git a/testing/test_pytest_html.py b/testing/test_pytest_html.py
index 091e3f3c..88477556 100644
--- a/testing/test_pytest_html.py
+++ b/testing/test_pytest_html.py
@@ -1,7 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# import builtins
 import json
 import os
 import random
@@ -13,28 +12,6 @@
 
 pytest_plugins = ("pytester",)
 
-# if os.name == "nt":
-#     # Force a utf-8 encoding on file io (since by default windows does not). See
-#     # https://github.com/pytest-dev/pytest-html/issues/336
-#     #  If we drop support for Python 3.6 and earlier could use python -X utf8 instead.
-#     _real_open = builtins.open
-#
-#     def _open(file, mode="r", buffering=-1, encoding=None, *args, **kwargs):
-#         if mode in ("r", "w") and encoding is None:
-#             encoding = "utf-8"
-#
-#         return _real_open(file, mode, buffering, encoding, *args, **kwargs)
-#
-#     builtins.open = _open
-
-
-# def remove_deprecation_from_recwarn(recwarn):
-#     # TODO: Temporary hack until they fix
-#     # https://github.com/pytest-dev/pytest/issues/6936
-#     return [
-#         item for item in recwarn if "TerminalReporter.writer" not in repr(item.message)
-#     ]
-
 
 def run(testdir, path="report.html", *args):
     path = testdir.tmpdir.join(path)
@@ -1021,8 +998,6 @@ def test_css(self, testdir, recwarn, colors):
             cssargs.extend(["--css", path])
         result, html = run(testdir, "report.html", "--self-contained-html", *cssargs)
         assert result.ret == 0
-        # warnings = remove_deprecation_from_recwarn(recwarn)
-        # assert len(warnings) == 0
         for k, v in css.items():
             assert str(v["path"]) in html
             assert v["style"] in html