From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 8 Oct 2015 16:05:36 +0000 (-0700)
Subject: Issue #23919: Prevents assert dialogs appearing in the test suite.
X-Git-Tag: v3.6.0a1~1303
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12c2945ccf8624e3978c5d2069dd18194f88becf;p=python

Issue #23919: Prevents assert dialogs appearing in the test suite.
---

diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index 6b18b3a9b7..21c3e66b54 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -304,6 +304,10 @@ def _parse_args(args, **kwargs):
     if ns.pgo and (ns.verbose or ns.verbose2 or ns.verbose3):
         parser.error("--pgo/-v don't go together!")
 
+    if ns.nowindows:
+        print("Warning: the --nowindows (-n) option is deprecated. "
+              "Use -vv to display assertions in stderr.", file=sys.stderr)
+
     if ns.quiet:
         ns.verbose = 0
     if ns.timeout is not None:
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 6a1c308ecf..6e05c7e6ff 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -75,8 +75,11 @@ def setup_tests(ns):
     if ns.threshold is not None:
         gc.set_threshold(ns.threshold)
 
-    if ns.nowindows:
+    try:
         import msvcrt
+    except ImportError:
+        pass
+    else:
         msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS|
                             msvcrt.SEM_NOALIGNMENTFAULTEXCEPT|
                             msvcrt.SEM_NOGPFAULTERRORBOX|
@@ -88,8 +91,11 @@ def setup_tests(ns):
             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)
 
     support.use_resources = ns.use_resources