mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
closes bpo-30117: fix lib2to3 ParserIdempotency test (GH-1242)
Fix two (in my opinion) spurious failure conditions in the lib2to3.tests.test_parser.TestParserIdempotency test_parser test. Use the same encoding found in the initial file to write a temp file for a diff. This retains the BOM if the encoding was initially utf-8-sig. If the file cannot be parsed using the normal grammar, try again with no print statement which should succeed for valid files using future print_function For case (1), the driver was correctly handling a BOM in a utf-8 file, but then the test was not writing a comparison file using 'utf-8-sig' to diff against, so the BOM got removed. I don't think that is the fault of the parser, and lib2to3 will retain the BOM. For case (2), lib2to3 pre-detects the use of from __future__ import print_function or allows the user to force this interpretation with a -p flag, and then selects a different grammar with the print statement removed. That makes the test cases unfair to this test as the driver itself doesn't know which grammar to use. As a minimal fix, the test will try using a grammar with the print statement, and if that fails fall back on a grammar without it. A more thorough handling of the idempotency test would to be to parse all files using both grammars and ignore if one of the two failed but otherwise check both. I didn't think this was necessary but can change.
This commit is contained in:
parent
ce0f33d045
commit
14e976e00e
2 changed files with 15 additions and 10 deletions
|
@ -8,7 +8,7 @@ test_grammar.py files from both Python 2 and Python 3.
|
|||
|
||||
# Testing imports
|
||||
from . import support
|
||||
from .support import driver
|
||||
from .support import driver, driver_no_print_statement
|
||||
from test.support import verbose
|
||||
|
||||
# Python imports
|
||||
|
@ -413,8 +413,6 @@ class TestParserIdempotency(support.TestCase):
|
|||
|
||||
"""A cut-down version of pytree_idempotency.py."""
|
||||
|
||||
# Issue 13125
|
||||
@unittest.expectedFailure
|
||||
def test_all_project_files(self):
|
||||
for filepath in support.all_project_files():
|
||||
with open(filepath, "rb") as fp:
|
||||
|
@ -425,12 +423,13 @@ class TestParserIdempotency(support.TestCase):
|
|||
source = fp.read()
|
||||
try:
|
||||
tree = driver.parse_string(source)
|
||||
except ParseError as err:
|
||||
if verbose > 0:
|
||||
warnings.warn('ParseError on file %s (%s)' % (filepath, err))
|
||||
continue
|
||||
except ParseError:
|
||||
try:
|
||||
tree = driver_no_print_statement.parse_string(source)
|
||||
except ParseError as err:
|
||||
self.fail('ParseError on file %s (%s)' % (filepath, err))
|
||||
new = str(tree)
|
||||
x = diff(filepath, new)
|
||||
x = diff(filepath, new, encoding=encoding)
|
||||
if x:
|
||||
self.fail("Idempotency failed: %s" % filepath)
|
||||
|
||||
|
@ -481,9 +480,9 @@ class TestGeneratorExpressions(GrammarTest):
|
|||
self.validate("set(x for x in [],)")
|
||||
|
||||
|
||||
def diff(fn, result):
|
||||
def diff(fn, result, encoding='utf-8'):
|
||||
try:
|
||||
with open('@', 'w') as f:
|
||||
with open('@', 'w', encoding=encoding, newline='\n') as f:
|
||||
f.write(str(result))
|
||||
fn = fn.replace('"', '\\"')
|
||||
return subprocess.call(['diff', '-u', fn, '@'], stdout=(subprocess.DEVNULL if verbose < 1 else None))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue