From: Victor Stinner <victor.stinner@gmail.com>
Date: Sat, 3 Oct 2015 19:40:21 +0000 (+0200)
Subject: Issue #25306: Try to fix test_huntrleaks_fd_leak() on Windows
X-Git-Tag: v3.6.0a1~1330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20d2118248f9313a9b77bb4d299252da7fc7fa2f;p=python

Issue #25306: Try to fix test_huntrleaks_fd_leak() on Windows

Issue #25306: Disable popup and logs to stderr on assertion failures in MSCRT.
---

diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index edbb4b0c78..2e33555afe 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -643,14 +643,24 @@ class ArgsTestCase(BaseTestCase):
         self.check_executed_tests(output, [test]*3, failed=test)
 
     @unittest.skipUnless(Py_DEBUG, 'need a debug build')
-    # Issue #25306: the test hangs sometimes on Windows
-    @unittest.skipIf(sys.platform == 'win32', 'test broken on Windows')
     def test_huntrleaks_fd_leak(self):
         # test --huntrleaks for file descriptor leak
         code = textwrap.dedent("""
             import os
             import unittest
 
+            # Issue #25306: Disable popups and logs to stderr on assertion
+            # failures in MSCRT
+            try:
+                import msvcrt
+                msvcrt.CrtSetReportMode
+            except (ImportError, AttributeError):
+                # no Windows, o release build
+                pass
+            else:
+                for m in [msvcrt.CRT_WARN, msvcrt.CRT_ERROR, msvcrt.CRT_ASSERT]:
+                    msvcrt.CrtSetReportMode(m, 0)
+
             class FDLeakTest(unittest.TestCase):
                 def test_leak(self):
                     fd = os.open(__file__, os.O_RDONLY)