From 7d49704d357e915d822b01ea2180f594b556b6e9 Mon Sep 17 00:00:00 2001 From: matejcik Date: Mon, 29 Jul 2024 14:54:23 +0200 Subject: [PATCH 1/2] chore: upgrade pytest to get rid of python 3.14 deprecation warnings --- poetry.lock | 63 +++++++++++------------ pyproject.toml | 4 +- tests/ui_tests/fixtures.json | 96 ++++++++++++++++++------------------ 3 files changed, 82 insertions(+), 81 deletions(-) diff --git a/poetry.lock b/poetry.lock index 948d65670c8..74500faa4f5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -19,17 +19,6 @@ wrapt = [ {version = ">=1.14,<2", markers = "python_version >= \"3.11\""}, ] -[[package]] -name = "atomicwrites" -version = "1.4.0" -description = "Atomic file writes." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, - {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, -] - [[package]] name = "attrs" version = "21.4.0" @@ -422,6 +411,20 @@ six = ">=1.9.0" gmpy = ["gmpy"] gmpy2 = ["gmpy2"] +[[package]] +name = "exceptiongroup" +version = "1.2.2" +description = "Backport of PEP 654 (exception groups)" +optional = false +python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, + {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"}, +] + +[package.extras] +test = ["pytest (>=6)"] + [[package]] name = "execnet" version = "1.9.0" @@ -505,13 +508,13 @@ pyproject = ["Flake8-pyproject"] [[package]] name = "flaky" -version = "3.7.0" -description = "Plugin for nose or pytest that automatically reruns flaky tests." +version = "3.8.1" +description = "Plugin for pytest that automatically reruns flaky tests." optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" files = [ - {file = "flaky-3.7.0-py2.py3-none-any.whl", hash = "sha256:d6eda73cab5ae7364504b7c44670f70abed9e75f77dd116352f662817592ec9c"}, - {file = "flaky-3.7.0.tar.gz", hash = "sha256:3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d"}, + {file = "flaky-3.8.1-py2.py3-none-any.whl", hash = "sha256:194ccf4f0d3a22b2de7130f4b62e45e977ac1b5ccad74d4d48f3005dcc38815e"}, + {file = "flaky-3.8.1.tar.gz", hash = "sha256:47204a81ec905f3d5acfbd61daeabcada8f9d4031616d9bcb0618461729699f5"}, ] [[package]] @@ -1023,13 +1026,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest- [[package]] name = "pluggy" -version = "1.0.0" +version = "1.5.0" description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, + {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"}, + {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"}, ] [package.extras] @@ -1171,27 +1174,25 @@ cp2110 = ["hidapi"] [[package]] name = "pytest" -version = "6.2.5" +version = "8.3.2" description = "pytest: simple powerful testing with Python" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, - {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, + {file = "pytest-8.3.2-py3-none-any.whl", hash = "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5"}, + {file = "pytest-8.3.2.tar.gz", hash = "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"}, ] [package.dependencies] -atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} -attrs = ">=19.2.0" colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=0.12,<2.0" -py = ">=1.8.2" -toml = "*" +pluggy = ">=1.5,<2" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-forked" @@ -1797,4 +1798,4 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it [metadata] lock-version = "2.0" python-versions = "^3.8.1" -content-hash = "6e63e1ae52fbff76a8e45b5c4bc58938a5537bce7b0eee7993bb55342e47b74a" +content-hash = "971d0f6f2926d839954b35b2029978046e282df3d8d595b1e176dc0cf37889fb" diff --git a/pyproject.toml b/pyproject.toml index 828ba7e5340..be12042a7f8 100644 --- a/pyproject.toml +++ b/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 = "*" diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index dd1efbda1fa..0a7e3e69fcb 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -514,8 +514,8 @@ "T1B1_en_misc-test_msg_getentropy.py::test_entropy[16]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", "T1B1_en_misc-test_msg_getentropy.py::test_entropy[17]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", "T1B1_en_misc-test_msg_getentropy.py::test_entropy[1]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", -"T1B1_en_misc-test_msg_getentropy.py::test_entropy[20]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", -"T1B1_en_misc-test_msg_getentropy.py::test_entropy[21]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", +"T1B1_en_misc-test_msg_getentropy.py::test_entropy[2_0]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", +"T1B1_en_misc-test_msg_getentropy.py::test_entropy[2_1]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", "T1B1_en_misc-test_msg_getentropy.py::test_entropy[256]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", "T1B1_en_misc-test_msg_getentropy.py::test_entropy[257]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", "T1B1_en_misc-test_msg_getentropy.py::test_entropy[32]": "10ee154b5db5599420a26df724cf2301afafb9bdb55429e4e091046881d589cb", @@ -2148,8 +2148,8 @@ "T2T1_cs_misc-test_msg_getentropy.py::test_entropy[16]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", "T2T1_cs_misc-test_msg_getentropy.py::test_entropy[17]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", "T2T1_cs_misc-test_msg_getentropy.py::test_entropy[1]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", -"T2T1_cs_misc-test_msg_getentropy.py::test_entropy[20]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", -"T2T1_cs_misc-test_msg_getentropy.py::test_entropy[21]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", +"T2T1_cs_misc-test_msg_getentropy.py::test_entropy[2_0]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", +"T2T1_cs_misc-test_msg_getentropy.py::test_entropy[2_1]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", "T2T1_cs_misc-test_msg_getentropy.py::test_entropy[256]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", "T2T1_cs_misc-test_msg_getentropy.py::test_entropy[257]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", "T2T1_cs_misc-test_msg_getentropy.py::test_entropy[32]": "939e425fcbde12fc4f9b48ae05c6de722f1611bacdb31454c3dad6b6f0690b56", @@ -3595,8 +3595,8 @@ "T2T1_de_misc-test_msg_getentropy.py::test_entropy[16]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", "T2T1_de_misc-test_msg_getentropy.py::test_entropy[17]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", "T2T1_de_misc-test_msg_getentropy.py::test_entropy[1]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", -"T2T1_de_misc-test_msg_getentropy.py::test_entropy[20]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", -"T2T1_de_misc-test_msg_getentropy.py::test_entropy[21]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", +"T2T1_de_misc-test_msg_getentropy.py::test_entropy[2_0]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", +"T2T1_de_misc-test_msg_getentropy.py::test_entropy[2_1]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", "T2T1_de_misc-test_msg_getentropy.py::test_entropy[256]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", "T2T1_de_misc-test_msg_getentropy.py::test_entropy[257]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", "T2T1_de_misc-test_msg_getentropy.py::test_entropy[32]": "6e8c41267a81614dcec53defd6a744340a7d78be469b6bdceade8eee77c6c596", @@ -5042,8 +5042,8 @@ "T2T1_en_misc-test_msg_getentropy.py::test_entropy[16]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", "T2T1_en_misc-test_msg_getentropy.py::test_entropy[17]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", "T2T1_en_misc-test_msg_getentropy.py::test_entropy[1]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", -"T2T1_en_misc-test_msg_getentropy.py::test_entropy[20]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", -"T2T1_en_misc-test_msg_getentropy.py::test_entropy[21]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", +"T2T1_en_misc-test_msg_getentropy.py::test_entropy[2_0]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", +"T2T1_en_misc-test_msg_getentropy.py::test_entropy[2_1]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", "T2T1_en_misc-test_msg_getentropy.py::test_entropy[256]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", "T2T1_en_misc-test_msg_getentropy.py::test_entropy[257]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", "T2T1_en_misc-test_msg_getentropy.py::test_entropy[32]": "4dd8a541e8181aac2011a397360f8450c048536a0af77d0360c5b048657fff2b", @@ -6507,8 +6507,8 @@ "T2T1_es_misc-test_msg_getentropy.py::test_entropy[16]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", "T2T1_es_misc-test_msg_getentropy.py::test_entropy[17]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", "T2T1_es_misc-test_msg_getentropy.py::test_entropy[1]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", -"T2T1_es_misc-test_msg_getentropy.py::test_entropy[20]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", -"T2T1_es_misc-test_msg_getentropy.py::test_entropy[21]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", +"T2T1_es_misc-test_msg_getentropy.py::test_entropy[2_0]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", +"T2T1_es_misc-test_msg_getentropy.py::test_entropy[2_1]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", "T2T1_es_misc-test_msg_getentropy.py::test_entropy[256]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", "T2T1_es_misc-test_msg_getentropy.py::test_entropy[257]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", "T2T1_es_misc-test_msg_getentropy.py::test_entropy[32]": "0ac92fc8cd4f3696c356d4a09f882390567ebd23095ccacf254d8af9d342011a", @@ -7954,8 +7954,8 @@ "T2T1_fr_misc-test_msg_getentropy.py::test_entropy[16]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", "T2T1_fr_misc-test_msg_getentropy.py::test_entropy[17]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", "T2T1_fr_misc-test_msg_getentropy.py::test_entropy[1]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", -"T2T1_fr_misc-test_msg_getentropy.py::test_entropy[20]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", -"T2T1_fr_misc-test_msg_getentropy.py::test_entropy[21]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", +"T2T1_fr_misc-test_msg_getentropy.py::test_entropy[2_0]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", +"T2T1_fr_misc-test_msg_getentropy.py::test_entropy[2_1]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", "T2T1_fr_misc-test_msg_getentropy.py::test_entropy[256]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", "T2T1_fr_misc-test_msg_getentropy.py::test_entropy[257]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", "T2T1_fr_misc-test_msg_getentropy.py::test_entropy[32]": "68bf167020f6e25f3aecd5e0224b3487c963968a6b9788c0a771987a1a88011d", @@ -9401,8 +9401,8 @@ "T2T1_it_misc-test_msg_getentropy.py::test_entropy[16]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", "T2T1_it_misc-test_msg_getentropy.py::test_entropy[17]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", "T2T1_it_misc-test_msg_getentropy.py::test_entropy[1]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", -"T2T1_it_misc-test_msg_getentropy.py::test_entropy[20]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", -"T2T1_it_misc-test_msg_getentropy.py::test_entropy[21]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", +"T2T1_it_misc-test_msg_getentropy.py::test_entropy[2_0]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", +"T2T1_it_misc-test_msg_getentropy.py::test_entropy[2_1]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", "T2T1_it_misc-test_msg_getentropy.py::test_entropy[256]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", "T2T1_it_misc-test_msg_getentropy.py::test_entropy[257]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", "T2T1_it_misc-test_msg_getentropy.py::test_entropy[32]": "b56abab8f8bc9fa3fa900b437ce26c9bec6bd4c5563b87fff4050698686b5ec2", @@ -10848,8 +10848,8 @@ "T2T1_pt_misc-test_msg_getentropy.py::test_entropy[16]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", "T2T1_pt_misc-test_msg_getentropy.py::test_entropy[17]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", "T2T1_pt_misc-test_msg_getentropy.py::test_entropy[1]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", -"T2T1_pt_misc-test_msg_getentropy.py::test_entropy[20]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", -"T2T1_pt_misc-test_msg_getentropy.py::test_entropy[21]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", +"T2T1_pt_misc-test_msg_getentropy.py::test_entropy[2_0]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", +"T2T1_pt_misc-test_msg_getentropy.py::test_entropy[2_1]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", "T2T1_pt_misc-test_msg_getentropy.py::test_entropy[256]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", "T2T1_pt_misc-test_msg_getentropy.py::test_entropy[257]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", "T2T1_pt_misc-test_msg_getentropy.py::test_entropy[32]": "2aae8275949cc3e5b4a8e570873eb528cea98528d19fbb94fb7178536fc77f0b", @@ -12295,8 +12295,8 @@ "T2T1_tr_misc-test_msg_getentropy.py::test_entropy[16]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", "T2T1_tr_misc-test_msg_getentropy.py::test_entropy[17]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", "T2T1_tr_misc-test_msg_getentropy.py::test_entropy[1]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", -"T2T1_tr_misc-test_msg_getentropy.py::test_entropy[20]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", -"T2T1_tr_misc-test_msg_getentropy.py::test_entropy[21]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", +"T2T1_tr_misc-test_msg_getentropy.py::test_entropy[2_0]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", +"T2T1_tr_misc-test_msg_getentropy.py::test_entropy[2_1]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", "T2T1_tr_misc-test_msg_getentropy.py::test_entropy[256]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", "T2T1_tr_misc-test_msg_getentropy.py::test_entropy[257]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", "T2T1_tr_misc-test_msg_getentropy.py::test_entropy[32]": "7c0b0add39af99fefdbccc1f770accbb7eebfce9d3e1df794f5a4e46a05caa81", @@ -14020,8 +14020,8 @@ "T3B1_cs_misc-test_msg_getentropy.py::test_entropy[16]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", "T3B1_cs_misc-test_msg_getentropy.py::test_entropy[17]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", "T3B1_cs_misc-test_msg_getentropy.py::test_entropy[1]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", -"T3B1_cs_misc-test_msg_getentropy.py::test_entropy[20]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", -"T3B1_cs_misc-test_msg_getentropy.py::test_entropy[21]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", +"T3B1_cs_misc-test_msg_getentropy.py::test_entropy[2_0]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", +"T3B1_cs_misc-test_msg_getentropy.py::test_entropy[2_1]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", "T3B1_cs_misc-test_msg_getentropy.py::test_entropy[256]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", "T3B1_cs_misc-test_msg_getentropy.py::test_entropy[257]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", "T3B1_cs_misc-test_msg_getentropy.py::test_entropy[32]": "90ad3706f2f17a135b5d783eaf5bc98bc5e500de96054ac132dafc72a0ac6c9c", @@ -15387,8 +15387,8 @@ "T3B1_de_misc-test_msg_getentropy.py::test_entropy[16]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", "T3B1_de_misc-test_msg_getentropy.py::test_entropy[17]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", "T3B1_de_misc-test_msg_getentropy.py::test_entropy[1]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", -"T3B1_de_misc-test_msg_getentropy.py::test_entropy[20]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", -"T3B1_de_misc-test_msg_getentropy.py::test_entropy[21]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", +"T3B1_de_misc-test_msg_getentropy.py::test_entropy[2_0]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", +"T3B1_de_misc-test_msg_getentropy.py::test_entropy[2_1]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", "T3B1_de_misc-test_msg_getentropy.py::test_entropy[256]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", "T3B1_de_misc-test_msg_getentropy.py::test_entropy[257]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", "T3B1_de_misc-test_msg_getentropy.py::test_entropy[32]": "0d6a6c0d344138d5eed4283ac8bfc8665a9115ca123b29fc897728e206c518b6", @@ -16754,8 +16754,8 @@ "T3B1_en_misc-test_msg_getentropy.py::test_entropy[16]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", "T3B1_en_misc-test_msg_getentropy.py::test_entropy[17]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", "T3B1_en_misc-test_msg_getentropy.py::test_entropy[1]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", -"T3B1_en_misc-test_msg_getentropy.py::test_entropy[20]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", -"T3B1_en_misc-test_msg_getentropy.py::test_entropy[21]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", +"T3B1_en_misc-test_msg_getentropy.py::test_entropy[2_0]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", +"T3B1_en_misc-test_msg_getentropy.py::test_entropy[2_1]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", "T3B1_en_misc-test_msg_getentropy.py::test_entropy[256]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", "T3B1_en_misc-test_msg_getentropy.py::test_entropy[257]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", "T3B1_en_misc-test_msg_getentropy.py::test_entropy[32]": "d50e2ba952e19254c8157bd29d3c6f29e40b6c92c02f1459fa4b9bf6b6c3f346", @@ -18121,8 +18121,8 @@ "T3B1_es_misc-test_msg_getentropy.py::test_entropy[16]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", "T3B1_es_misc-test_msg_getentropy.py::test_entropy[17]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", "T3B1_es_misc-test_msg_getentropy.py::test_entropy[1]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", -"T3B1_es_misc-test_msg_getentropy.py::test_entropy[20]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", -"T3B1_es_misc-test_msg_getentropy.py::test_entropy[21]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", +"T3B1_es_misc-test_msg_getentropy.py::test_entropy[2_0]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", +"T3B1_es_misc-test_msg_getentropy.py::test_entropy[2_1]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", "T3B1_es_misc-test_msg_getentropy.py::test_entropy[256]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", "T3B1_es_misc-test_msg_getentropy.py::test_entropy[257]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", "T3B1_es_misc-test_msg_getentropy.py::test_entropy[32]": "1338c90768f03ee237fab46948670510f9c11426cac29615ac5a16b9eed29661", @@ -19488,8 +19488,8 @@ "T3B1_fr_misc-test_msg_getentropy.py::test_entropy[16]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", "T3B1_fr_misc-test_msg_getentropy.py::test_entropy[17]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", "T3B1_fr_misc-test_msg_getentropy.py::test_entropy[1]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", -"T3B1_fr_misc-test_msg_getentropy.py::test_entropy[20]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", -"T3B1_fr_misc-test_msg_getentropy.py::test_entropy[21]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", +"T3B1_fr_misc-test_msg_getentropy.py::test_entropy[2_0]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", +"T3B1_fr_misc-test_msg_getentropy.py::test_entropy[2_1]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", "T3B1_fr_misc-test_msg_getentropy.py::test_entropy[256]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", "T3B1_fr_misc-test_msg_getentropy.py::test_entropy[257]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", "T3B1_fr_misc-test_msg_getentropy.py::test_entropy[32]": "2cf5399e4fed31225f612bbbb1dbebff6d024d7a29db2672b1d57f79580eef6a", @@ -20855,8 +20855,8 @@ "T3B1_it_misc-test_msg_getentropy.py::test_entropy[16]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", "T3B1_it_misc-test_msg_getentropy.py::test_entropy[17]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", "T3B1_it_misc-test_msg_getentropy.py::test_entropy[1]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", -"T3B1_it_misc-test_msg_getentropy.py::test_entropy[20]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", -"T3B1_it_misc-test_msg_getentropy.py::test_entropy[21]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", +"T3B1_it_misc-test_msg_getentropy.py::test_entropy[2_0]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", +"T3B1_it_misc-test_msg_getentropy.py::test_entropy[2_1]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", "T3B1_it_misc-test_msg_getentropy.py::test_entropy[256]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", "T3B1_it_misc-test_msg_getentropy.py::test_entropy[257]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", "T3B1_it_misc-test_msg_getentropy.py::test_entropy[32]": "f31cfba6f4995637c382193d16f535729ee2c95053d5539c6e9340b5d0a3dbe8", @@ -22222,8 +22222,8 @@ "T3B1_pt_misc-test_msg_getentropy.py::test_entropy[16]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", "T3B1_pt_misc-test_msg_getentropy.py::test_entropy[17]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", "T3B1_pt_misc-test_msg_getentropy.py::test_entropy[1]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", -"T3B1_pt_misc-test_msg_getentropy.py::test_entropy[20]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", -"T3B1_pt_misc-test_msg_getentropy.py::test_entropy[21]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", +"T3B1_pt_misc-test_msg_getentropy.py::test_entropy[2_0]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", +"T3B1_pt_misc-test_msg_getentropy.py::test_entropy[2_1]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", "T3B1_pt_misc-test_msg_getentropy.py::test_entropy[256]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", "T3B1_pt_misc-test_msg_getentropy.py::test_entropy[257]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", "T3B1_pt_misc-test_msg_getentropy.py::test_entropy[32]": "d47e0c774864a97c340ad3d8596e2f22cfc5644593bea30c9c836715b1aefb11", @@ -24008,8 +24008,8 @@ "T3T1_cs_misc-test_msg_getentropy.py::test_entropy[16]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", "T3T1_cs_misc-test_msg_getentropy.py::test_entropy[17]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", "T3T1_cs_misc-test_msg_getentropy.py::test_entropy[1]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", -"T3T1_cs_misc-test_msg_getentropy.py::test_entropy[20]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", -"T3T1_cs_misc-test_msg_getentropy.py::test_entropy[21]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", +"T3T1_cs_misc-test_msg_getentropy.py::test_entropy[2_0]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", +"T3T1_cs_misc-test_msg_getentropy.py::test_entropy[2_1]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", "T3T1_cs_misc-test_msg_getentropy.py::test_entropy[256]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", "T3T1_cs_misc-test_msg_getentropy.py::test_entropy[257]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", "T3T1_cs_misc-test_msg_getentropy.py::test_entropy[32]": "6898656ce9e6b4f4ab818e0b250dae248ee6ba4e5286f4f9003e823b99310679", @@ -25366,8 +25366,8 @@ "T3T1_de_misc-test_msg_getentropy.py::test_entropy[16]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", "T3T1_de_misc-test_msg_getentropy.py::test_entropy[17]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", "T3T1_de_misc-test_msg_getentropy.py::test_entropy[1]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", -"T3T1_de_misc-test_msg_getentropy.py::test_entropy[20]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", -"T3T1_de_misc-test_msg_getentropy.py::test_entropy[21]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", +"T3T1_de_misc-test_msg_getentropy.py::test_entropy[2_0]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", +"T3T1_de_misc-test_msg_getentropy.py::test_entropy[2_1]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", "T3T1_de_misc-test_msg_getentropy.py::test_entropy[256]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", "T3T1_de_misc-test_msg_getentropy.py::test_entropy[257]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", "T3T1_de_misc-test_msg_getentropy.py::test_entropy[32]": "07f309f6cb445f186d2bf8e802154f348a9cb602afd1748fa5c0b0581a5fda8f", @@ -26724,8 +26724,8 @@ "T3T1_en_misc-test_msg_getentropy.py::test_entropy[16]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", "T3T1_en_misc-test_msg_getentropy.py::test_entropy[17]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", "T3T1_en_misc-test_msg_getentropy.py::test_entropy[1]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", -"T3T1_en_misc-test_msg_getentropy.py::test_entropy[20]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", -"T3T1_en_misc-test_msg_getentropy.py::test_entropy[21]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", +"T3T1_en_misc-test_msg_getentropy.py::test_entropy[2_0]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", +"T3T1_en_misc-test_msg_getentropy.py::test_entropy[2_1]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", "T3T1_en_misc-test_msg_getentropy.py::test_entropy[256]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", "T3T1_en_misc-test_msg_getentropy.py::test_entropy[257]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", "T3T1_en_misc-test_msg_getentropy.py::test_entropy[32]": "a2d1889f065df248882f8c096beb1709146289f2dce17607f43582aedf7da01d", @@ -28082,8 +28082,8 @@ "T3T1_es_misc-test_msg_getentropy.py::test_entropy[16]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", "T3T1_es_misc-test_msg_getentropy.py::test_entropy[17]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", "T3T1_es_misc-test_msg_getentropy.py::test_entropy[1]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", -"T3T1_es_misc-test_msg_getentropy.py::test_entropy[20]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", -"T3T1_es_misc-test_msg_getentropy.py::test_entropy[21]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", +"T3T1_es_misc-test_msg_getentropy.py::test_entropy[2_0]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", +"T3T1_es_misc-test_msg_getentropy.py::test_entropy[2_1]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", "T3T1_es_misc-test_msg_getentropy.py::test_entropy[256]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", "T3T1_es_misc-test_msg_getentropy.py::test_entropy[257]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", "T3T1_es_misc-test_msg_getentropy.py::test_entropy[32]": "290e1f039c264ba5fb8b54a7759834d152a6fb0ce319814d2cd40ef7dac88a9d", @@ -29440,8 +29440,8 @@ "T3T1_fr_misc-test_msg_getentropy.py::test_entropy[16]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", "T3T1_fr_misc-test_msg_getentropy.py::test_entropy[17]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", "T3T1_fr_misc-test_msg_getentropy.py::test_entropy[1]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", -"T3T1_fr_misc-test_msg_getentropy.py::test_entropy[20]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", -"T3T1_fr_misc-test_msg_getentropy.py::test_entropy[21]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", +"T3T1_fr_misc-test_msg_getentropy.py::test_entropy[2_0]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", +"T3T1_fr_misc-test_msg_getentropy.py::test_entropy[2_1]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", "T3T1_fr_misc-test_msg_getentropy.py::test_entropy[256]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", "T3T1_fr_misc-test_msg_getentropy.py::test_entropy[257]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", "T3T1_fr_misc-test_msg_getentropy.py::test_entropy[32]": "aa24b196a5ec983fc1844c6d55fa15efd44a373803df10ad16f7b798a3e79af1", @@ -30798,8 +30798,8 @@ "T3T1_it_misc-test_msg_getentropy.py::test_entropy[16]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", "T3T1_it_misc-test_msg_getentropy.py::test_entropy[17]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", "T3T1_it_misc-test_msg_getentropy.py::test_entropy[1]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", -"T3T1_it_misc-test_msg_getentropy.py::test_entropy[20]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", -"T3T1_it_misc-test_msg_getentropy.py::test_entropy[21]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", +"T3T1_it_misc-test_msg_getentropy.py::test_entropy[2_0]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", +"T3T1_it_misc-test_msg_getentropy.py::test_entropy[2_1]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", "T3T1_it_misc-test_msg_getentropy.py::test_entropy[256]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", "T3T1_it_misc-test_msg_getentropy.py::test_entropy[257]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", "T3T1_it_misc-test_msg_getentropy.py::test_entropy[32]": "e8bab729f15ae5aae2733ff84b17d8424f087ddb90559a71a112b361788486d5", @@ -32156,8 +32156,8 @@ "T3T1_pt_misc-test_msg_getentropy.py::test_entropy[16]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", "T3T1_pt_misc-test_msg_getentropy.py::test_entropy[17]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", "T3T1_pt_misc-test_msg_getentropy.py::test_entropy[1]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", -"T3T1_pt_misc-test_msg_getentropy.py::test_entropy[20]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", -"T3T1_pt_misc-test_msg_getentropy.py::test_entropy[21]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", +"T3T1_pt_misc-test_msg_getentropy.py::test_entropy[2_0]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", +"T3T1_pt_misc-test_msg_getentropy.py::test_entropy[2_1]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", "T3T1_pt_misc-test_msg_getentropy.py::test_entropy[256]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", "T3T1_pt_misc-test_msg_getentropy.py::test_entropy[257]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", "T3T1_pt_misc-test_msg_getentropy.py::test_entropy[32]": "86135aa85524f35db52abdfc64299b474761a5ba1a23cd79fdf7cf92793dd242", @@ -33502,8 +33502,8 @@ "T3T1_tr_misc-test_msg_getentropy.py::test_entropy[16]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", "T3T1_tr_misc-test_msg_getentropy.py::test_entropy[17]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", "T3T1_tr_misc-test_msg_getentropy.py::test_entropy[1]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", -"T3T1_tr_misc-test_msg_getentropy.py::test_entropy[20]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", -"T3T1_tr_misc-test_msg_getentropy.py::test_entropy[21]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", +"T3T1_tr_misc-test_msg_getentropy.py::test_entropy[2_0]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", +"T3T1_tr_misc-test_msg_getentropy.py::test_entropy[2_1]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", "T3T1_tr_misc-test_msg_getentropy.py::test_entropy[256]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", "T3T1_tr_misc-test_msg_getentropy.py::test_entropy[257]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", "T3T1_tr_misc-test_msg_getentropy.py::test_entropy[32]": "74985c3bb5397bd0ac50d4b18120c37a89506f05306c08ae5966bf100924840e", From b4f5c5ee6ea0aed1690079fa0b1e060b7d11f008 Mon Sep 17 00:00:00 2001 From: matejcik Date: Tue, 30 Jul 2024 11:28:34 +0200 Subject: [PATCH 2/2] fix(tests): python >=3.11 compatibility for identifiers Python 3.11 changed IntEnum.__str__ to return the number instead of the enum value name. This breaks fixtures.json because pytest uses str(value) to generate the test identifier names, and in a lot of places our identifiers use the enum values. This override of `_idval_from_value` explicitly generates a name from the IntEnum instead of using the __str__ implementation. --- tests/conftest.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 0c9f364b050..499fdeb47c7 100644 --- a/tests/conftest.py +++ b/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).