From 162d45c531552d0699f945d2c22a763941dca3c1 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Fri, 9 Aug 2019 01:22:59 +0100 Subject: [PATCH] [3.8] bpo-37795: Capture DeprecationWarnings in the test suite (GH-15184) (GH-15188) (cherry picked from commit aa542c2) Co-authored-by: Pablo Galindo --- Lib/distutils/tests/test_bdist.py | 6 +++++- Lib/test/test_httplib.py | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/tests/test_bdist.py b/Lib/distutils/tests/test_bdist.py index c80b3edc022..130d8bf155a 100644 --- a/Lib/distutils/tests/test_bdist.py +++ b/Lib/distutils/tests/test_bdist.py @@ -2,6 +2,7 @@ import os import unittest from test.support import run_unittest +import warnings from distutils.command.bdist import bdist from distutils.tests import support @@ -38,7 +39,10 @@ class BuildTestCase(support.TempdirManager, names.append('bdist_msi') for name in names: - subcmd = cmd.get_finalized_command(name) + with warnings.catch_warnings(): + warnings.filterwarnings('ignore', 'bdist_wininst command is deprecated', + DeprecationWarning) + subcmd = cmd.get_finalized_command(name) if getattr(subcmd, '_unsupported', False): # command is not supported on this build continue diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index 9148169cc7c..656932fbaab 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -7,6 +7,7 @@ import array import re import socket import threading +import warnings import unittest TestCase = unittest.TestCase @@ -1759,8 +1760,11 @@ class HTTPSTest(TestCase): self.assertIs(h._context, context) self.assertFalse(h._context.post_handshake_auth) - h = client.HTTPSConnection('localhost', 443, context=context, - cert_file=CERT_localhost) + with warnings.catch_warnings(): + warnings.filterwarnings('ignore', 'key_file, cert_file and check_hostname are deprecated', + DeprecationWarning) + h = client.HTTPSConnection('localhost', 443, context=context, + cert_file=CERT_localhost) self.assertTrue(h._context.post_handshake_auth)