#12890: fix test on windows
Patch by Stephen Tonkin.
diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py
index b91fe50..2e072a9 100644
--- a/Lib/test/test_cgitb.py
+++ b/Lib/test/test_cgitb.py
@@ -36,13 +36,12 @@
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 @@
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)
diff --git a/Misc/ACKS b/Misc/ACKS
index 1db8194..d80ead0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1174,6 +1174,7 @@
R Lindsay Todd
Eugene Toder
Erik Tollerud
+Stephen Tonkin
Matias Torchinsky
Sandro Tosi
Richard Townsend