X Tutup
Skip to content

bpo-32101: Fix tests for PYTHONDEVMODE=1 #4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Dec 12, 2017
Merged

bpo-32101: Fix tests for PYTHONDEVMODE=1 #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Lib/test/test_asyncio/test_base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
12 changes: 5 additions & 7 deletions Lib/test/test_asyncio/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
14 changes: 6 additions & 8 deletions Lib/test/test_faulthandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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")

Expand Down
X Tutup