mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 00:22:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Issue #24210: Silence more PendingDeprecationWarning warnings in tests.

Browse source
This commit is contained in:
Berker Peksag 2015-05-16 23:21:26 +03:00
parent b744f3a45e
commit 9e7990ae21
2 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_platform.py
View file

@ -236,6 +236,13 @@ class PlatformTest(unittest.TestCase):
self.assertEqual(sts, 0) self.assertEqual(sts, 0)
def test_dist(self): def test_dist(self):
with warnings.catch_warnings():
warnings.filterwarnings(
'ignore',
'dist\(\) and linux_distribution\(\) '
'functions are deprecated .*',
PendingDeprecationWarning,
)
res = platform.dist() res = platform.dist()
def test_libc_ver(self): def test_libc_ver(self):
@ -305,6 +312,13 @@ class PlatformTest(unittest.TestCase):
f.write('Fedora release 19 (Schr\xf6dinger\u2019s Cat)\n') f.write('Fedora release 19 (Schr\xf6dinger\u2019s Cat)\n')
with mock.patch('platform._UNIXCONFDIR', tempdir): with mock.patch('platform._UNIXCONFDIR', tempdir):
with warnings.catch_warnings():
warnings.filterwarnings(
'ignore',
'dist\(\) and linux_distribution\(\) '
'functions are deprecated .*',
PendingDeprecationWarning,
)
distname, version, distid = platform.linux_distribution() distname, version, distid = platform.linux_distribution()
self.assertEqual(distname, 'Fedora') self.assertEqual(distname, 'Fedora')

8
Lib/test/test_ssl.py
View file

@ -3294,11 +3294,19 @@ else:
def test_main(verbose=False): def test_main(verbose=False):
if support.verbose: if support.verbose:
import warnings
plats = { plats = {
'Linux': platform.linux_distribution, 'Linux': platform.linux_distribution,
'Mac': platform.mac_ver, 'Mac': platform.mac_ver,
'Windows': platform.win32_ver, 'Windows': platform.win32_ver,
} }
with warnings.catch_warnings():
warnings.filterwarnings(
'ignore',
'dist\(\) and linux_distribution\(\) '
'functions are deprecated .*',
PendingDeprecationWarning,
)
for name, func in plats.items(): for name, func in plats.items():
plat = func() plat = func()
if plat and plat[0]: if plat and plat[0]: