Skip to content

Commit

Permalink
[3.12] gh-117347: Fix test_clinic side effects (#117363) (#117365)
Browse files Browse the repository at this point in the history
gh-117347: Fix test_clinic side effects (#117363)

Save/restore converters in ClinicWholeFileTest and
ClinicExternalTest.

(cherry picked from commit 35b6c4a)
  • Loading branch information
vstinner authored Mar 29, 2024
1 parent 2a18945 commit c80d138
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions Lib/test/test_clinic.py
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

0 comments on commit c80d138

Please sign in to comment.