From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 11 Aug 2022 00:15:53 +0000 (-0700)
Subject: gh-95349: Hide a Distutils Warning Filter for test_check_c_globals (GH-95837)
X-Git-Tag: v3.10.7~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b11895e3e7cbe13f5be0f6321f2690af664a247f;p=thirdparty%2FPython%2Fcpython.git

gh-95349: Hide a Distutils Warning Filter for test_check_c_globals (GH-95837)


Under certain build conditions, test_check_c_globals fails.  This fix takes the same approach as we took for gh-84236 (via gh-20095).  We'll be removing use of distutils in the c-analyzer at some point.  Until then we'll hide the warning filter.
(cherry picked from commit 3ff6d9affb351292ad8530802e7c06f651520706)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
---

diff --git a/Lib/test/test_check_c_globals.py b/Lib/test/test_check_c_globals.py
index 030debc452e4..898807a5e692 100644
--- a/Lib/test/test_check_c_globals.py
+++ b/Lib/test/test_check_c_globals.py
@@ -1,9 +1,14 @@
 import unittest
 import test.test_tools
+from test.support.warnings_helper import save_restore_warnings_filters
 
 test.test_tools.skip_if_missing('c-analyzer')
 with test.test_tools.imports_under_tool('c-analyzer'):
-    from cpython.__main__ import main
+    # gh-95349: Save/restore warnings filters to leave them unchanged.
+    # Importing the c-analyzer imports docutils which imports pkg_resources
+    # which adds a warnings filter.
+    with save_restore_warnings_filters():
+        from cpython.__main__ import main
 
 
 class ActualChecks(unittest.TestCase):