commit: 2cb3e18880d4d41edd302aabaa92d032701e6560 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 27 15:52:01 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 27 15:52:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb3e188
dev-python/h2: fix tests w/ >=py3.11 Signed-off-by: Sam James <sam <AT> gentoo.org> .../h2/files/h2-4.1.0-python3.11-tests.patch | 104 +++++++++++++++++++++ dev-python/h2/h2-4.1.0-r1.ebuild | 6 +- 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch b/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch new file mode 100644 index 000000000000..c444e6a5007a --- /dev/null +++ b/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch @@ -0,0 +1,104 @@ +https://github.com/python-hyper/h2/commit/eabe727282e7a7aa3254773292f86cf341bdc597 + +From eabe727282e7a7aa3254773292f86cf341bdc597 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <[email protected]> +Date: Sun, 3 Jul 2022 12:05:05 +0200 +Subject: [PATCH] Fix repr() checks for Python 3.11 + +In Python 3.11, repr() was modified, this commit fixes the +assertions to match the new repr() behavior. + +Fix #1268 +--- a/test/test_events.py ++++ b/test/test_events.py +@@ -207,11 +207,18 @@ def test_remotesettingschanged_repr(self): + ), + } + +- assert repr(e) == ( +- "<RemoteSettingsChanged changed_settings:{ChangedSetting(" +- "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " +- "new_value=32768)}>" +- ) ++ if sys.version_info >= (3, 11): ++ assert repr(e) == ( ++ "<RemoteSettingsChanged changed_settings:{ChangedSetting(" ++ "setting=4, original_value=65536, " ++ "new_value=32768)}>" ++ ) ++ else: ++ assert repr(e) == ( ++ "<RemoteSettingsChanged changed_settings:{ChangedSetting(" ++ "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " ++ "new_value=32768)}>" ++ ) + + def test_pingreceived_repr(self): + """ +@@ -249,10 +256,16 @@ def test_streamreset_repr(self): + e.error_code = h2.errors.ErrorCodes.ENHANCE_YOUR_CALM + e.remote_reset = False + +- assert repr(e) == ( +- "<StreamReset stream_id:919, " +- "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>" +- ) ++ if sys.version_info >= (3, 11): ++ assert repr(e) == ( ++ "<StreamReset stream_id:919, " ++ "error_code:11, remote_reset:False>" ++ ) ++ else: ++ assert repr(e) == ( ++ "<StreamReset stream_id:919, " ++ "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>" ++ ) + + def test_pushedstreamreceived_repr(self): + """ +@@ -284,11 +297,18 @@ def test_settingsacknowledged_repr(self): + ), + } + +- assert repr(e) == ( +- "<SettingsAcknowledged changed_settings:{ChangedSetting(" +- "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " +- "new_value=32768)}>" +- ) ++ if sys.version_info >= (3, 11): ++ assert repr(e) == ( ++ "<SettingsAcknowledged changed_settings:{ChangedSetting(" ++ "setting=4, original_value=65536, " ++ "new_value=32768)}>" ++ ) ++ else: ++ assert repr(e) == ( ++ "<SettingsAcknowledged changed_settings:{ChangedSetting(" ++ "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " ++ "new_value=32768)}>" ++ ) + + def test_priorityupdated_repr(self): + """ +@@ -318,10 +338,16 @@ def test_connectionterminated_repr(self, additional_data, data_repr): + e.last_stream_id = 33 + e.additional_data = additional_data + +- assert repr(e) == ( +- "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, " +- "last_stream_id:33, additional_data:%s>" % data_repr +- ) ++ if sys.version_info >= (3, 11): ++ assert repr(e) == ( ++ "<ConnectionTerminated error_code:12, " ++ "last_stream_id:33, additional_data:%s>" % data_repr ++ ) ++ else: ++ assert repr(e) == ( ++ "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, " ++ "last_stream_id:33, additional_data:%s>" % data_repr ++ ) + + def test_alternativeserviceavailable_repr(self): + """ + diff --git a/dev-python/h2/h2-4.1.0-r1.ebuild b/dev-python/h2/h2-4.1.0-r1.ebuild index f04351c78eca..7dee9b75abc0 100644 --- a/dev-python/h2/h2-4.1.0-r1.ebuild +++ b/dev-python/h2/h2-4.1.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -32,6 +32,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${P}-python3.11-tests.patch +) + distutils_enable_tests pytest python_test() {
