upgrade pytest

pyproject.toml

@@ -13,9 +13,9 @@ protobuf = "*"
 nanopb = "^0.4.3"
 
 ## test tools
-pytest = "^6.1.0"
+pytest = "^8"
 coverage = "<5"  # coverage 5+ uses binary sqlite format
-flaky = "^3.6.1"  # https://github.com/box/flaky/issues/156
+flaky = ">3.6.1"  # https://github.com/box/flaky/issues/156
 pytest-ordering = "*"
 pytest-random-order = "*"
 pytest-timeout = "*"

tests/conftest.py

@@ -18,10 +18,12 @@
 
 import os
 import typing as t
+from enum import IntEnum
 from pathlib import Path
 
 import pytest
 import xdist
+from _pytest.python import IdMaker
 from _pytest.reports import TestReport
 
 from trezorlib import debuglink, log, models
@@ -464,6 +466,15 @@ def pytest_configure(config: "Config") -> None:
     if config.getoption("verbose"):
         log.enable_debug_output()
 
+    idval_orig = IdMaker._idval_from_value
+
+    def idval_from_value(self: IdMaker, val: object) -> str | None:
+        if isinstance(val, IntEnum):
+            return f"{type(val).__name__}.{val.name}"
+        return idval_orig(self, val)
+
+    IdMaker._idval_from_value = idval_from_value
+
 
 def pytest_runtest_setup(item: pytest.Item) -> None:
     """Called for each test item (class, individual tests).