summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-04-25 22:55:08 (GMT)
committerGitHub <noreply@github.com>2017-04-25 22:55:08 (GMT)
commitd819ad9832292d854e9710493ecdf959b69802e3 (patch)
tree7017464f6c3b593673c8f07aed4f7cebad25dd67 /Lib
parent08c16016e2a2d1368d001ddebfe9ca92465773c4 (diff)
downloadcpython-d819ad9832292d854e9710493ecdf959b69802e3.zip
cpython-d819ad9832292d854e9710493ecdf959b69802e3.tar.gz
cpython-d819ad9832292d854e9710493ecdf959b69802e3.tar.bz2
bpo-30107: Make SuppressCrashReport quiet on macOS (#1279)
On macOS, SuppressCrashReport now redirects /usr/bin/defaults command stderr into a pipe to not pollute stderr. It fixes a test_io.test_daemon_threads_shutdown_stderr_deadlock() failure when the CrashReporter domain doesn't exists. Message logged into stderr: 2017-04-24 16:57:21.432 defaults[41046:2462851] The domain/default pair of (com.apple.CrashReporter, DialogType) does not exist
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/support/__init__.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 56b6b07..ed611c9 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2447,6 +2447,7 @@ class SuppressCrashReport:
(0, self.old_value[1]))
except (ValueError, OSError):
pass
+
if sys.platform == 'darwin':
# Check if the 'Crash Reporter' on OSX was configured
# in 'Developer' mode and warn that it will get triggered
@@ -2454,10 +2455,14 @@ class SuppressCrashReport:
#
# This assumes that this context manager is used in tests
# that might trigger the next manager.
- value = subprocess.Popen(['/usr/bin/defaults', 'read',
- 'com.apple.CrashReporter', 'DialogType'],
- stdout=subprocess.PIPE).communicate()[0]
- if value.strip() == b'developer':
+ cmd = ['/usr/bin/defaults', 'read',
+ 'com.apple.CrashReporter', 'DialogType']
+ proc = subprocess.Popen(cmd,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ with proc:
+ stdout = proc.communicate()[0]
+ if stdout.strip() == b'developer':
print("this test triggers the Crash Reporter, "
"that is intentional", end='', flush=True)