diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-10-27 21:39:57 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-10-27 21:39:57 (GMT) |
| commit | 7c38ec2de090db31f092b4ada4e7c9a529254c7b (patch) | |
| tree | fd1f90cad4987b615e4d8529b92bd1da299a70cb | |
| parent | 7041b995cd474740b5681e6f514a7db7c2ab35f3 (diff) | |
| parent | 74076cb85ecd0580fdced994fbfb053f6f39f59c (diff) | |
| download | cpython-7c38ec2de090db31f092b4ada4e7c9a529254c7b.zip cpython-7c38ec2de090db31f092b4ada4e7c9a529254c7b.tar.gz cpython-7c38ec2de090db31f092b4ada4e7c9a529254c7b.tar.bz2 | |
merge #12890: skip tests which fail on windows until fixed or rewritten.
We may rewrite these using mock per issue 15749.
| -rw-r--r-- | Lib/test/test_cgitb.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_cgitb.py b/Lib/test/test_cgitb.py index 4017772..b91fe50 100644 --- a/Lib/test/test_cgitb.py +++ b/Lib/test/test_cgitb.py @@ -2,8 +2,6 @@ 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): @@ -38,6 +36,7 @@ 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( @@ -51,6 +50,7 @@ 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: |