merge heads

2012-05-20 16:59:51 +08:00 · 2012-05-20 16:59:51 +08:00 · 9237bb638f
parent 9cffd882ab 269d21336a
commit 9237bb638f
1 changed files with 1 additions and 0 deletions
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@ -1877,6 +1877,7 @@ class ChildLoggerTest(BaseTest):

 class HandlerTest(BaseTest):

+    @unittest.skipIf(os.name == 'nt', 'Temporarily disabled for Windows')
    @unittest.skipUnless(threading, 'Threading required for this test.')
    def test_race(self):
        # Issue #14632 refers.