[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

[senthil.kumaran]

http://hg.python.org/cpython/rev/bd42068caf00
changeset:   77077:bd42068caf00
branch:      2.7
parent:      77074:f457419552e3
parent:      77073:235ee0a32ab5
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun May 20 16:59:51 2012 +0800
summary:
  merge heads

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

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