summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-06-25 19:54:17 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-06-25 19:54:17 (GMT)
commitef8115e5ebcb316eade7346785eee533b07ef8e5 (patch)
tree85b8c56690f37e6e0f15dac4cac52c583d3a9a7e /Lib
parent383a820e0dd05273940c9513be7ee17d912aa54f (diff)
downloadcpython-ef8115e5ebcb316eade7346785eee533b07ef8e5.zip
cpython-ef8115e5ebcb316eade7346785eee533b07ef8e5.tar.gz
cpython-ef8115e5ebcb316eade7346785eee533b07ef8e5.tar.bz2
Issue #17206: Fix test_cmd_line and test_faulthandler for my previous change
(test.regrtest and test.script_helper enable faulthandler module in subprocesses).
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_cmd_line.py17
-rw-r--r--Lib/test/test_faulthandler.py8
2 files changed, 17 insertions, 8 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 9ae882f..1270ce3 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -54,12 +54,19 @@ class CmdLineTest(unittest.TestCase):
self.assertNotIn(b'stack overflow', err)
def test_xoptions(self):
- rc, out, err = assert_python_ok('-c', 'import sys; print(sys._xoptions)')
- opts = eval(out.splitlines()[0])
+ def get_xoptions(*args):
+ # use subprocess module directly because test.script_helper adds
+ # "-X faulthandler" to the command line
+ args = (sys.executable, '-E') + args
+ args += ('-c', 'import sys; print(sys._xoptions)')
+ out = subprocess.check_output(args)
+ opts = eval(out.splitlines()[0])
+ return opts
+
+ opts = get_xoptions()
self.assertEqual(opts, {})
- rc, out, err = assert_python_ok(
- '-Xa', '-Xb=c,d=e', '-c', 'import sys; print(sys._xoptions)')
- opts = eval(out.splitlines()[0])
+
+ opts = get_xoptions('-Xa', '-Xb=c,d=e')
self.assertEqual(opts, {'a': True, 'b': 'c,d=e'})
def test_showrefcount(self):
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index 2ddc7bc..0eba284 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -262,9 +262,11 @@ faulthandler._sigsegv()
def test_disabled_by_default(self):
# By default, the module should be disabled
code = "import faulthandler; print(faulthandler.is_enabled())"
- rc, stdout, stderr = assert_python_ok("-c", code)
- stdout = (stdout + stderr).strip()
- self.assertEqual(stdout, b"False")
+ args = (sys.executable, '-E', '-c', code)
+ # use subprocess module directly because test.script_helper adds
+ # "-X faulthandler" to the command line
+ stdout = subprocess.check_output(args)
+ self.assertEqual(stdout.rstrip(), b"False")
def test_sys_xoptions(self):
# Test python -X faulthandler