mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge #12890: don't emit <p> tags in text mode when logdir specified.

Browse source 
Patch by Jeff McNeil.
This commit is contained in:
R David Murray 2012-10-27 14:55:25 -04:00
commit c4b8e05092
4 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/test/test_cgitb.py
View file

@ -1,7 +1,9 @@
from test.support import run_unittest
from test.script_helper import assert_python_failure, temp_dir
import unittest
import sys
import subprocess
import tempfile
import cgitb
class TestCgitb(unittest.TestCase):
@ -36,16 +38,31 @@ class TestCgitb(unittest.TestCase):
self.assertIn("ValueError", text)
self.assertIn("Hello World", text)
def test_hook(self):
proc = subprocess.Popen([sys.executable, '-c',
('import cgitb;'
'cgitb.enable();'
'raise ValueError("Hello World")')],
stdout=subprocess.PIPE)
out = proc.stdout.read().decode(sys.getfilesystemencoding())
self.addCleanup(proc.stdout.close)
def test_syshook_no_logdir_default_format(self):
with temp_dir() as tracedir:
rc, out, err = assert_python_failure(
'-c',
('import cgitb; cgitb.enable(logdir="%s"); '
'raise ValueError("Hello World")') % tracedir)
out = out.decode(sys.getfilesystemencoding())
self.assertIn("ValueError", out)
self.assertIn("Hello World", out)
# By default we emit HTML markup.
self.assertIn('<p>', out)
self.assertIn('</p>', out)
def test_syshook_no_logdir_text_format(self):
# Issue 12890: we were emitting the <p> tag in text mode.
with temp_dir() as tracedir:
rc, out, err = assert_python_failure(
'-c',
('import cgitb; cgitb.enable(format="text", logdir="%s"); '
'raise ValueError("Hello World")') % tracedir)
out = out.decode(sys.getfilesystemencoding())
self.assertIn("ValueError", out)
self.assertIn("Hello World", out)
self.assertNotIn('<p>', out)
self.assertNotIn('</p>', out)
def test_main():