summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-10-08 15:56:06 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-10-08 15:56:06 (GMT)
commit12ee7448f85db38bbf0a9eb3fce873774bd9426d (patch)
tree22a76eb531476cdd7e1a38da96a2552dd674d2f1
parentce88d82ec26877e0fcd6c7ebe0a1b72dccd3a833 (diff)
downloadcpython-12ee7448f85db38bbf0a9eb3fce873774bd9426d.zip
cpython-12ee7448f85db38bbf0a9eb3fce873774bd9426d.tar.gz
cpython-12ee7448f85db38bbf0a9eb3fce873774bd9426d.tar.bz2
Issue #23919: Prevents assert dialogs appearing in the test suite.
-rwxr-xr-xLib/test/regrtest.py13
-rw-r--r--Misc/NEWS2
2 files changed, 13 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index a04c3f7..c246fe0 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -511,7 +511,13 @@ def main(tests=None, **kwargs):
import gc
gc.set_threshold(ns.threshold)
if ns.nowindows:
+ print('The --nowindows (-n) option is deprecated. '
+ 'Use -vv to display assertions in stderr.')
+ try:
import msvcrt
+ except ImportError:
+ pass
+ else:
msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS|
msvcrt.SEM_NOALIGNMENTFAULTEXCEPT|
msvcrt.SEM_NOGPFAULTERRORBOX|
@@ -523,8 +529,11 @@ def main(tests=None, **kwargs):
pass
else:
for m in [msvcrt.CRT_WARN, msvcrt.CRT_ERROR, msvcrt.CRT_ASSERT]:
- msvcrt.CrtSetReportMode(m, msvcrt.CRTDBG_MODE_FILE)
- msvcrt.CrtSetReportFile(m, msvcrt.CRTDBG_FILE_STDERR)
+ if ns.verbose and ns.verbose >= 2:
+ msvcrt.CrtSetReportMode(m, msvcrt.CRTDBG_MODE_FILE)
+ msvcrt.CrtSetReportFile(m, msvcrt.CRTDBG_FILE_STDERR)
+ else:
+ msvcrt.CrtSetReportMode(m, 0)
if ns.wait:
input("Press any key to continue...")
diff --git a/Misc/NEWS b/Misc/NEWS
index e055bd5..cfa1541 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -278,6 +278,8 @@ Documentation
Tests
-----
+- Issue #23919: Prevents assert dialogs appearing in the test suite.
+
- PCbuild\rt.bat now accepts an unlimited number of arguments to pass along
to regrtest.py. Previously there was a limit of 9.