From cc4bacf2070f83479abb54592c35c7d2c6508000 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Tue, 30 Oct 2012 20:20:09 -0400 Subject: [PATCH] #12890: fix test on windows Patch by Stephen Tonkin. --- Lib/test/test_cgitb.py | 10 ++++------ Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py index b91fe504191..2e072a9f2ac 100644 --- a/Lib/test/test_cgitb.py +++ b/Lib/test/test_cgitb.py @@ -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('

', out) self.assertIn('

', 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

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 1db819477a0..d80ead042e1 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1174,6 +1174,7 @@ Bennett Todd R Lindsay Todd Eugene Toder Erik Tollerud +Stephen Tonkin Matias Torchinsky Sandro Tosi Richard Townsend