Skip to content

Commit c80d138

Browse files
authored
[3.12] gh-117347: Fix test_clinic side effects (#117363) (#117365)
gh-117347: Fix test_clinic side effects (#117363) Save/restore converters in ClinicWholeFileTest and ClinicExternalTest. (cherry picked from commit 35b6c4a)
1 parent 2a18945 commit c80d138

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

Lib/test/test_clinic.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,20 @@
2121
from clinic import DSLParser
2222

2323

24+
def restore_dict(converters, old_converters):
25+
converters.clear()
26+
converters.update(old_converters)
27+
28+
29+
def save_restore_converters(testcase):
30+
testcase.addCleanup(restore_dict, clinic.converters,
31+
clinic.converters.copy())
32+
testcase.addCleanup(restore_dict, clinic.legacy_converters,
33+
clinic.legacy_converters.copy())
34+
testcase.addCleanup(restore_dict, clinic.return_converters,
35+
clinic.return_converters.copy())
36+
37+
2438
class _ParserBase(TestCase):
2539
maxDiff = None
2640

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

108122
class ClinicWholeFileTest(_ParserBase):
109123
def setUp(self):
124+
save_restore_converters(self)
110125
self.clinic = clinic.Clinic(clinic.CLanguage(None), filename="test.c")
111126

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

1387+
def setUp(self):
1388+
save_restore_converters(self)
1389+
13721390
def _do_test(self, *args, expect_success=True):
13731391
with subprocess.Popen(
13741392
[sys.executable, "-Xutf8", self.clinic_py, *args],

0 commit comments

Comments
 (0)