Skip to content

gh-131031: Fix separated running of pickle tests #133218

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

Closed
wants to merge 2 commits into from
Closed

gh-131031: Fix separated running of pickle tests #133218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2732a22
Fix separated running of `pickle` tests
donBarbos Apr 30, 2025
45d670c
Correct fix
donBarbos May 3, 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
31 changes: 24 additions & 7 deletions Lib/test/pickletester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import types
import unittest
import weakref
from contextlib import contextmanager
from textwrap import dedent
from http.cookies import SimpleCookie

Expand Down Expand Up @@ -152,6 +153,17 @@ def __getinitargs__(self):
__main__.E = E
E.__module__ = "__main__"

@contextmanager
def fake_main_module():
real_main = sys.modules.get("__main__")
fake_main = types.ModuleType("__main__")

sys.modules["__main__"] = fake_main
Copy link
Member

Choose a reason for hiding this comment

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

You can use support.swap_item(). It is already used in other tests to fake a module.

try:
yield
finally:
sys.modules["__main__"] = real_main

# Simple mutable object.
class Object:
pass
Expand Down Expand Up @@ -2287,10 +2299,12 @@ def test_nested_lookup_error(self):
obj.__module__ = None
for proto in protocols:
with self.subTest(proto=proto):
with self.assertRaises(pickle.PicklingError) as cm:
self.dumps(obj, proto)
with fake_main_module():
with self.assertRaises(pickle.PicklingError) as cm:
self.dumps(obj, proto)
self.assertEqual(str(cm.exception),
f"Can't pickle {obj!r}: it's not found as __main__.AbstractPickleTests.spam")
f"Can't pickle {obj!r}: "
"it's not found as __main__.AbstractPickleTests.spam")
self.assertEqual(str(cm.exception.__context__),
"module '__main__' has no attribute 'AbstractPickleTests'")

Expand All @@ -2304,16 +2318,19 @@ def test_wrong_object_lookup_error(self):
with self.assertRaises(pickle.PicklingError) as cm:
self.dumps(obj, proto)
self.assertEqual(str(cm.exception),
f"Can't pickle {obj!r}: it's not the same object as {__name__}.AbstractPickleTests")
f"Can't pickle {obj!r}: "
f"it's not the same object as {__name__}.AbstractPickleTests")
self.assertIsNone(cm.exception.__context__)

obj.__module__ = None
for proto in protocols:
with self.subTest(proto=proto):
with self.assertRaises(pickle.PicklingError) as cm:
self.dumps(obj, proto)
with fake_main_module():
with self.assertRaises(pickle.PicklingError) as cm:
self.dumps(obj, proto)
self.assertEqual(str(cm.exception),
f"Can't pickle {obj!r}: it's not found as __main__.AbstractPickleTests")
f"Can't pickle {obj!r}: "
"it's not found as __main__.AbstractPickleTests")
self.assertEqual(str(cm.exception.__context__),
"module '__main__' has no attribute 'AbstractPickleTests'")

Expand Down
Loading