diff options
author | Senthil Kumaran <senthil@uthcode.com> | 2012-05-20 08:59:51 (GMT) |
---|---|---|
committer | Senthil Kumaran <senthil@uthcode.com> | 2012-05-20 08:59:51 (GMT) |
commit | 9237bb638f5204b798e884465310293858f71816 (patch) | |
tree | ea3eb7143add3a0dcf83bce28a01d3c418683a30 /Lib | |
parent | 9cffd882ab6ec00450626567f06aad43e5b5243a (diff) | |
parent | 269d21336a1b68ef8e772759341236097b5dd8b3 (diff) | |
download | cpython-9237bb638f5204b798e884465310293858f71816.zip cpython-9237bb638f5204b798e884465310293858f71816.tar.gz cpython-9237bb638f5204b798e884465310293858f71816.tar.bz2 |
merge heads
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_logging.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 08e2dca..eed5a84 100644 --- 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. |