diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2015-05-16 20:21:26 (GMT) |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2015-05-16 20:21:26 (GMT) |
commit | 9e7990ae21fd32b25631a23bcdb00c8a086bb0c6 (patch) | |
tree | 20abb0304f634067793d1226922adafe3c8ad378 /Lib/test | |
parent | b744f3a45e3228ea2b344c8cf9424e2592dc93b7 (diff) | |
download | cpython-9e7990ae21fd32b25631a23bcdb00c8a086bb0c6.zip cpython-9e7990ae21fd32b25631a23bcdb00c8a086bb0c6.tar.gz cpython-9e7990ae21fd32b25631a23bcdb00c8a086bb0c6.tar.bz2 |
Issue #24210: Silence more PendingDeprecationWarning warnings in tests.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_platform.py | 18 | ||||
-rw-r--r-- | Lib/test/test_ssl.py | 22 |
2 files changed, 31 insertions, 9 deletions
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index f4ce36d..3ea71f1 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -236,7 +236,14 @@ class PlatformTest(unittest.TestCase): self.assertEqual(sts, 0) def test_dist(self): - res = platform.dist() + with warnings.catch_warnings(): + warnings.filterwarnings( + 'ignore', + 'dist\(\) and linux_distribution\(\) ' + 'functions are deprecated .*', + PendingDeprecationWarning, + ) + res = platform.dist() def test_libc_ver(self): import os @@ -305,7 +312,14 @@ class PlatformTest(unittest.TestCase): f.write('Fedora release 19 (Schr\xf6dinger\u2019s Cat)\n') with mock.patch('platform._UNIXCONFDIR', tempdir): - distname, version, distid = platform.linux_distribution() + with warnings.catch_warnings(): + warnings.filterwarnings( + 'ignore', + 'dist\(\) and linux_distribution\(\) ' + 'functions are deprecated .*', + PendingDeprecationWarning, + ) + distname, version, distid = platform.linux_distribution() self.assertEqual(distname, 'Fedora') self.assertEqual(version, '19') diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 9140fc1..f314ff4 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -3294,18 +3294,26 @@ else: def test_main(verbose=False): if support.verbose: + import warnings plats = { 'Linux': platform.linux_distribution, 'Mac': platform.mac_ver, 'Windows': platform.win32_ver, } - for name, func in plats.items(): - plat = func() - if plat and plat[0]: - plat = '%s %r' % (name, plat) - break - else: - plat = repr(platform.platform()) + with warnings.catch_warnings(): + warnings.filterwarnings( + 'ignore', + 'dist\(\) and linux_distribution\(\) ' + 'functions are deprecated .*', + PendingDeprecationWarning, + ) + for name, func in plats.items(): + plat = func() + if plat and plat[0]: + plat = '%s %r' % (name, plat) + break + else: + plat = repr(platform.platform()) print("test_ssl: testing with %r %r" % (ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO)) print(" under %s" % plat) |