[Python-checkins] bpo-32101: Fix tests for PYTHONDEVMODE=1 (#4821)
Victor Stinner
webhook-mailer at python.org
Tue Dec 12 17:15:02 EST 2017
https://github.com/python/cpython/commit/721e25c6535d08bd3d4d891fb2b540472e19f899
commit: 721e25c6535d08bd3d4d891fb2b540472e19f899
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-12-12T23:15:00+01:00
summary:
bpo-32101: Fix tests for PYTHONDEVMODE=1 (#4821)
test_asycio: remove also aio_path which was used when asyncio was
developed outside the stdlib.
files:
M Lib/test/test_asyncio/test_base_events.py
M Lib/test/test_asyncio/test_tasks.py
M Lib/test/test_faulthandler.py
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 8b08ed16634..e43fe6948af 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -802,17 +802,20 @@ def test_env_var_debug(self):
self.assertEqual(stdout.rstrip(), b'False')
sts, stdout, stderr = assert_python_ok('-c', code,
- PYTHONASYNCIODEBUG='')
+ PYTHONASYNCIODEBUG='',
+ PYTHONDEVMODE='')
self.assertEqual(stdout.rstrip(), b'False')
sts, stdout, stderr = assert_python_ok('-c', code,
- PYTHONASYNCIODEBUG='1')
+ PYTHONASYNCIODEBUG='1',
+ PYTHONDEVMODE='')
self.assertEqual(stdout.rstrip(), b'True')
sts, stdout, stderr = assert_python_ok('-E', '-c', code,
PYTHONASYNCIODEBUG='1')
self.assertEqual(stdout.rstrip(), b'False')
+ # -X dev
sts, stdout, stderr = assert_python_ok('-E', '-X', 'dev',
'-c', code)
self.assertEqual(stdout.rstrip(), b'True')
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 071481dbc26..0838ebf3a7b 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2257,33 +2257,31 @@ def test_return_exceptions(self):
self.assertEqual(fut.result(), [3, 1, exc, exc2])
def test_env_var_debug(self):
- aio_path = os.path.dirname(os.path.dirname(asyncio.__file__))
-
code = '\n'.join((
'import asyncio.coroutines',
'print(asyncio.coroutines._DEBUG)'))
# Test with -E to not fail if the unit test was run with
# PYTHONASYNCIODEBUG set to a non-empty string
- sts, stdout, stderr = assert_python_ok('-E', '-c', code,
- PYTHONPATH=aio_path)
+ sts, stdout, stderr = assert_python_ok('-E', '-c', code)
self.assertEqual(stdout.rstrip(), b'False')
sts, stdout, stderr = assert_python_ok('-c', code,
PYTHONASYNCIODEBUG='',
- PYTHONPATH=aio_path)
+ PYTHONDEVMODE='')
self.assertEqual(stdout.rstrip(), b'False')
sts, stdout, stderr = assert_python_ok('-c', code,
PYTHONASYNCIODEBUG='1',
- PYTHONPATH=aio_path)
+ PYTHONDEVMODE='')
self.assertEqual(stdout.rstrip(), b'True')
sts, stdout, stderr = assert_python_ok('-E', '-c', code,
PYTHONASYNCIODEBUG='1',
- PYTHONPATH=aio_path)
+ PYTHONDEVMODE='')
self.assertEqual(stdout.rstrip(), b'False')
+ # -X dev
sts, stdout, stderr = assert_python_ok('-E', '-X', 'dev',
'-c', code)
self.assertEqual(stdout.rstrip(), b'True')
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index 3647bfc719e..d6dc4ba55d9 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -332,13 +332,9 @@ def test_is_enabled(self):
def test_disabled_by_default(self):
# By default, the module should be disabled
code = "import faulthandler; print(faulthandler.is_enabled())"
- args = filter(None, (sys.executable,
- "-E" if sys.flags.ignore_environment else "",
- "-c", code))
- env = os.environ.copy()
- env.pop("PYTHONFAULTHANDLER", None)
+ args = (sys.executable, "-E", "-c", code)
# don't use assert_python_ok() because it always enables faulthandler
- output = subprocess.check_output(args, env=env)
+ output = subprocess.check_output(args)
self.assertEqual(output.rstrip(), b"False")
def test_sys_xoptions(self):
@@ -357,15 +353,17 @@ def test_env_var(self):
# empty env var
code = "import faulthandler; print(faulthandler.is_enabled())"
args = (sys.executable, "-c", code)
- env = os.environ.copy()
+ env = dict(os.environ)
env['PYTHONFAULTHANDLER'] = ''
+ env['PYTHONDEVMODE'] = ''
# don't use assert_python_ok() because it always enables faulthandler
output = subprocess.check_output(args, env=env)
self.assertEqual(output.rstrip(), b"False")
# non-empty env var
- env = os.environ.copy()
+ env = dict(os.environ)
env['PYTHONFAULTHANDLER'] = '1'
+ env['PYTHONDEVMODE'] = ''
output = subprocess.check_output(args, env=env)
self.assertEqual(output.rstrip(), b"True")
More information about the Python-checkins
mailing list