diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-08 16:05:36 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-08 16:05:36 (GMT) |
| commit | 12c2945ccf8624e3978c5d2069dd18194f88becf (patch) | |
| tree | 4f18561d6d5482c240311213c043c4979a9d16cb | |
| parent | b6c9572fa9e88029beda2d9cc6b387020f0a7d69 (diff) | |
| download | cpython-12c2945ccf8624e3978c5d2069dd18194f88becf.zip cpython-12c2945ccf8624e3978c5d2069dd18194f88becf.tar.gz cpython-12c2945ccf8624e3978c5d2069dd18194f88becf.tar.bz2 | |
Issue #23919: Prevents assert dialogs appearing in the test suite.
| -rw-r--r-- | Lib/test/libregrtest/cmdline.py | 4 | ||||
| -rw-r--r-- | Lib/test/libregrtest/setup.py | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py index 6b18b3a..21c3e66 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 6a1c308..6e05c7e 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 |