traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-26901: Fix the Argument Clinic test suite (GH-8879) 

* Fix Tools/clinic/clinic_test.py: add missing
  FakeClinic.destination_buffers attribute and pass a file argument
  to Clinic().
* Rename Tools/clinic/clinic_test.py to Lib/test/test_clinic.py:
  add temporary Tools/clinic/ to sys.path to import the clinic
  module.

Co-Authored-By: Pablo Galindo <pablogsal@gmail.com>
This commit is contained in:
Victor Stinner 2018-09-03 23:17:20 +02:00 committed by GitHub
parent 73b00becbd
commit 65fc98e7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Tools/clinic/clinic_test.py → Lib/test/test_clinic.py
View File

@ -1,16 +1,26 @@
# Argument Clinic # Argument Clinic
# Copyright 2012-2013 by Larry Hastings. # Copyright 2012-2013 by Larry Hastings.
# Licensed to the PSF under a contributor agreement. # Licensed to the PSF under a contributor agreement.
#
import clinic from test import support
from clinic import DSLParser from unittest import TestCase
import collections import collections
import inspect import inspect
from test import support import os.path
import sys import sys
import unittest import unittest
from unittest import TestCase
clinic_path = os.path.join(os.path.dirname(__file__), '..', '..', 'Tools', 'clinic')
clinic_path = os.path.normpath(clinic_path)
if not os.path.exists(clinic_path):
raise unittest.SkipTest(f'{clinic_path!r} path does not exist')
sys.path.append(clinic_path)
try:
import clinic
from clinic import DSLParser
finally:
del sys.path[-1]
class FakeConverter: class FakeConverter:
@ -35,7 +45,7 @@ class FakeConvertersDict:
return self.used_converters.setdefault(name, FakeConverterFactory(name)) return self.used_converters.setdefault(name, FakeConverterFactory(name))
clinic.Clinic.presets_text = '' clinic.Clinic.presets_text = ''
c = clinic.Clinic(language='C') c = clinic.Clinic(language='C', filename = "file")
class FakeClinic: class FakeClinic:
def __init__(self): def __init__(self):
@ -43,6 +53,7 @@ class FakeClinic:
self.legacy_converters = FakeConvertersDict() self.legacy_converters = FakeConvertersDict()
self.language = clinic.CLanguage(None) self.language = clinic.CLanguage(None)
self.filename = None self.filename = None
self.destination_buffers = {}
self.block_parser = clinic.BlockParser('', self.language) self.block_parser = clinic.BlockParser('', self.language)
self.modules = collections.OrderedDict() self.modules = collections.OrderedDict()
self.classes = collections.OrderedDict() self.classes = collections.OrderedDict()
@ -93,7 +104,7 @@ class ClinicWholeFileTest(TestCase):
# so it would spit out an end line for you. # so it would spit out an end line for you.
# and since you really already had one, # and since you really already had one,
# the last line of the block got corrupted. # the last line of the block got corrupted.
c = clinic.Clinic(clinic.CLanguage(None)) c = clinic.Clinic(clinic.CLanguage(None), filename="file")
raw = "/*[clinic]\nfoo\n[clinic]*/" raw = "/*[clinic]\nfoo\n[clinic]*/"
cooked = c.parse(raw).splitlines() cooked = c.parse(raw).splitlines()
end_line = cooked[2].rstrip() end_line = cooked[2].rstrip()
@ -252,7 +263,7 @@ xyz
def _test_clinic(self, input, output): def _test_clinic(self, input, output):
language = clinic.CLanguage(None) language = clinic.CLanguage(None)
c = clinic.Clinic(language) c = clinic.Clinic(language, filename="file")
c.parsers['inert'] = InertParser(c) c.parsers['inert'] = InertParser(c)
c.parsers['copy'] = CopyParser(c) c.parsers['copy'] = CopyParser(c)
computed = c.parse(input) computed = c.parse(input)