merge heads

9237bb63 · Senthil Kumaran · 9cffd882 · 269d2133 · 9237bb63
Commit 9237bb63 authored May 20, 2012 by Senthil Kumaran
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Lib/test/test_logging.py Lib/test/test_logging.py +1 -0

No files found.
--- 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.