Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#12890: fix test on windows 

Patch by Stephen Tonkin.
This commit is contained in:
R David Murray 2012-10-30 20:20:09 -04:00
parent 6b879fa402
commit cc4bacf207
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_cgitb.py
View File

@ -36,13 +36,12 @@ class TestCgitb(unittest.TestCase):
self.assertIn("ValueError", text)
self.assertIn("Hello World", text)
@unittest.skipIf(sys.platform=='win32', "test fails on windows, see issue 12890")
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)
('import cgitb; cgitb.enable(logdir=%s); '
'raise ValueError("Hello World")') % repr(tracedir))
out = out.decode(sys.getfilesystemencoding())
self.assertIn("ValueError", out)
self.assertIn("Hello World", out)
@ -50,14 +49,13 @@ class TestCgitb(unittest.TestCase):
self.assertIn('<p>', out)
self.assertIn('</p>', out)
@unittest.skipIf(sys.platform=='win32', "test fails on windows, see issue 12890")
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)
('import cgitb; cgitb.enable(format="text", logdir=%s); '
'raise ValueError("Hello World")') % repr(tracedir))
out = out.decode(sys.getfilesystemencoding())
self.assertIn("ValueError", out)
self.assertIn("Hello World", out)

1
Misc/ACKS
View File

@ -1174,6 +1174,7 @@ Bennett Todd
R Lindsay Todd
Eugene Toder
Erik Tollerud
Stephen Tonkin
Matias Torchinsky
Sandro Tosi
Richard Townsend