[Python-checkins] cpython (merge 3.3 -> default): merge #12890: skip tests which fail on windows until fixed or rewritten.

[r.david.murray]

http://hg.python.org/cpython/rev/57a33af85407
changeset:   79993:57a33af85407
parent:      79991:f9bd7633316c
parent:      79992:0e4574595674
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Oct 27 17:39:57 2012 -0400
summary:
  merge #12890: skip tests which fail on windows until fixed or rewritten.

We may rewrite these using mock per issue 15749.

files:
  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
--- a/Lib/test/test_cgitb.py
+++ b/Lib/test/test_cgitb.py
@@ -2,8 +2,6 @@
 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 @@
             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 @@
         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:

-- 
Repository URL: http://hg.python.org/cpython