Skip to content

gh-136297: Fix hypothesis and subTest usage in test_zoneinfo_property.py #136384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 8, 2025
Merged

gh-136297: Fix hypothesis and subTest usage in test_zoneinfo_property.py #136384

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a620cbb
gh-136297: Fix `hypothesis` and `subTest` usage in `test_zoneinfo_pro…
sobolevn Jul 7, 2025
e4cb74c
CI must fail now
sobolevn Jul 7, 2025
514bba0
CI must fail now
sobolevn Jul 7, 2025
cec90db
Remove `subTest` again
sobolevn Jul 7, 2025
cda40c4
Address review
sobolevn Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ jobs:
#
# (GH-104097) test_sysconfig is skipped because it has tests that are
# failing when executed from inside a virtual environment.
"${VENV_PYTHON}" -m test \
"${VENV_PYTHON}" -We -m test \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not related change. It is better to do it separately, and first examine the history, because it can break tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I will open a new issue about it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done #136409

-W \
--slowest \
-j4 \
Expand Down
16 changes: 7 additions & 9 deletions Lib/test/test_zoneinfo/test_zoneinfo_property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,23 +147,21 @@ def setUp(self):
def test_pickle_unpickle_cache(self, key):
zi = self.klass(key)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(proto=proto):
pkl_str = pickle.dumps(zi, proto)
zi_rt = pickle.loads(pkl_str)
pkl_str = pickle.dumps(zi, proto)
zi_rt = pickle.loads(pkl_str)

self.assertIs(zi, zi_rt)
self.assertIs(zi, zi_rt)

@hypothesis.given(key=valid_keys())
@add_key_examples
def test_pickle_unpickle_no_cache(self, key):
zi = self.klass.no_cache(key)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
with self.subTest(proto=proto):
pkl_str = pickle.dumps(zi, proto)
zi_rt = pickle.loads(pkl_str)
pkl_str = pickle.dumps(zi, proto)
zi_rt = pickle.loads(pkl_str)

self.assertIsNot(zi, zi_rt)
self.assertEqual(str(zi), str(zi_rt))
self.assertIsNot(zi, zi_rt)
self.assertEqual(str(zi), str(zi_rt))

@hypothesis.given(key=valid_keys())
@add_key_examples
Expand Down
2 changes: 1 addition & 1 deletion Tools/requirements-hypothesis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Requirements file for hypothesis that
# we use to run our property-based tests in CI.

hypothesis==6.111.2
hypothesis==6.135.26
Loading