Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
Patch by Mikhail Novikov.
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index f32404c..3968e6a 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -11,10 +11,14 @@
# Testing imports
from . import support
from .support import driver, test_dir
+from test.support import verbose
# Python imports
import os
+import sys
import unittest
+import warnings
+import subprocess
# Local imports
from lib2to3.pgen2 import tokenize
@@ -171,10 +175,12 @@
try:
tree = driver.parse_string(source)
except ParseError as err:
- print('ParseError on file', filepath, err)
+ if verbose > 0:
+ warnings.warn('ParseError on file %s (%s)' % (filepath, err))
continue
new = str(tree)
- if diff(filepath, new):
+ x = diff(filepath, new)
+ if x:
self.fail("Idempotency failed: %s" % filepath)
def test_extended_unpacking(self):
@@ -183,6 +189,7 @@
driver.parse_string("(z, *y, w) = m\n")
driver.parse_string("for *z, m in d: pass\n")
+
class TestLiterals(GrammarTest):
def validate(self, s):
@@ -221,7 +228,7 @@
with open('@', 'w') as f:
f.write(str(result))
fn = fn.replace('"', '\\"')
- return os.system('diff -u "%s" @' % fn)
+ return subprocess.call(['diff', '-u', fn, '@'], stdout=(subprocess.DEVNULL if verbose < 1 else None))
finally:
try:
os.remove("@")
diff --git a/Misc/ACKS b/Misc/ACKS
index 36d7e84..3f9cff9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -665,6 +665,7 @@
Tim Northover
Joe Norton
Neal Norwitz
+Mikhail Novikov
Michal Nowikowski
Steffen Daode Nurpmeso
Nigel O'Brian
diff --git a/Misc/NEWS b/Misc/NEWS
index b69eb4b..d8dbe79 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,9 @@
Library
-------
+- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
+ Patch by Mikhail Novikov.
+
- Issue #13447: Add a test file to host regression tests for bugs in the
scripts found in the Tools directory.