Commit 22163f22 authored by Stefan Krah's avatar Stefan Krah Committed by Leo

main/python3: add reliability fix for test_nntplib

parent 7691cb5e
Pipeline #72802 passed with stages
in 41 minutes and 28 seconds
......@@ -22,6 +22,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
bpo-36044-Reduce-number-of-unit-tests-run-for-PGO-build.patch
CVE-2020-14422.patch
d9b8f138b7df3b455b54653ca59f491b4840d6fa.patch
test_nntplib.patch
"
builddir="$srcdir/Python-$pkgver"
......@@ -170,10 +171,10 @@ wininst() {
mv "$pkgdir"/usr/lib/python$_basever/distutils/command/*.exe \
"$subpkgdir"/usr/lib/python$_basever/distutils/command
}
sha512sums="ddc838a7b0c442c2e465616f20231f2b703ed6b69ed2dc17858aac8760814fdf7cff43d350d359300e47b6bb1f0bd38c31126b855e423a3a65ed06a8fa16d136 Python-3.7.7.tar.xz
37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad fix-xattrs-glibc.patch
ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch
ad2715f2a4ddfed714f6040b79deed691f457e1e57c5d880c741ef71c5db5bad02a5faab50c32cd98e517ad1117ddf6d2fea0c3daf178d029e6a5fce2f95444a bpo-36044-Reduce-number-of-unit-tests-run-for-PGO-build.patch
f84922e46e39d681c0d1f95a211b81c6fba1fc3636379fa5c6b47284d693478b6afe08e07703678d9d8ce8e59295df2a705f9a0c8cb54a69a1fee6960d2ebddd CVE-2020-14422.patch
2c80b5945cd8d49c69ca7822f07a87e2f56902c61020ffcb5bc17a1a284987cef1bfc848e9da84d8d32e7788f405ce0c86c028acd3166e16cdefcd64d543d3c6 d9b8f138b7df3b455b54653ca59f491b4840d6fa.patch"
2c80b5945cd8d49c69ca7822f07a87e2f56902c61020ffcb5bc17a1a284987cef1bfc848e9da84d8d32e7788f405ce0c86c028acd3166e16cdefcd64d543d3c6 d9b8f138b7df3b455b54653ca59f491b4840d6fa.patch
f0b2da4937cac618c40b9e2b6e332de321cd6d292820f11a74122a6c1440f4dadc73dead6a1cf07ea54af3c4db66e0ba38af83f139f7d5f77d479c179376139d test_nntplib.patch"
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index fbd7db03defb1..89a2004dfb139 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -82,7 +82,7 @@ def _check_desc(desc):
desc = self.server.description(self.GROUP_NAME)
_check_desc(desc)
# Another sanity check
- self.assertIn("Python", desc)
+ self.assertIn(self.DESC, desc)
# With a pattern
desc = self.server.description(self.GROUP_PAT)
_check_desc(desc)
@@ -299,6 +299,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
NNTP_HOST = 'news.trigofacile.com'
GROUP_NAME = 'fr.comp.lang.python'
GROUP_PAT = 'fr.comp.lang.*'
+ DESC = 'Python'
NNTP_CLASS = NNTP
@@ -332,8 +333,11 @@ class NetworkedNNTP_SSLTests(NetworkedNNTPTests):
# 400 connections per day are accepted from each IP address."
NNTP_HOST = 'nntp.aioe.org'
- GROUP_NAME = 'comp.lang.python'
- GROUP_PAT = 'comp.lang.*'
+ # bpo-42794: aioe.test is one of the official groups on this server
+ # used for testing: https://news.aioe.org/manual/aioe-hierarchy/
+ GROUP_NAME = 'aioe.test'
+ GROUP_PAT = 'aioe.*'
+ DESC = 'test'
NNTP_CLASS = getattr(nntplib, 'NNTP_SSL', None)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment