Skip to content

[3.12] gh-117347: Fix test_clinic side effects (#117363) #117365

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
vstinner merged 1 commit into from
Mar 29, 2024
+18 −0
Merged

[3.12] gh-117347: Fix test_clinic side effects (#117363) #117365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions Lib/test/test_clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@
from clinic import DSLParser


def restore_dict(converters, old_converters):
converters.clear()
converters.update(old_converters)


def save_restore_converters(testcase):
testcase.addCleanup(restore_dict, clinic.converters,
clinic.converters.copy())
testcase.addCleanup(restore_dict, clinic.legacy_converters,
clinic.legacy_converters.copy())
testcase.addCleanup(restore_dict, clinic.return_converters,
clinic.return_converters.copy())


class _ParserBase(TestCase):
maxDiff = None

Expand Down Expand Up @@ -107,6 +121,7 @@ def directive(self, name, args):

class ClinicWholeFileTest(_ParserBase):
def setUp(self):
save_restore_converters(self)
self.clinic = clinic.Clinic(clinic.CLanguage(None), filename="test.c")

def expect_failure(self, raw):
Expand Down Expand Up @@ -1369,6 +1384,9 @@ class ClinicExternalTest(TestCase):
maxDiff = None
clinic_py = os.path.join(test_tools.toolsdir, "clinic", "clinic.py")

def setUp(self):
save_restore_converters(self)

def _do_test(self, *args, expect_success=True):
with subprocess.Popen(
[sys.executable, "-Xutf8", self.clinic_py, *args],
Expand Down