summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-01-01 10:42:16 -0800
committerGitHub <noreply@github.com>2021-01-01 13:42:16 -0500
commit546baba63a446e261d0248338f9034e56eccfc46 (patch)
tree56c1cbc65a8e280dc5831ac48a12d79def68398f
parentbpo-40791: Make compare_digest more constant-time. (GH-23438) (GH-23767) (diff)
downloadcpython-546baba63a446e261d0248338f9034e56eccfc46.tar.gz
cpython-546baba63a446e261d0248338f9034e56eccfc46.tar.bz2
cpython-546baba63a446e261d0248338f9034e56eccfc46.zip
bpo-42794: Update test_nntplib to use offical group name for testing (GH-24037) (GH-24042)
(cherry picked from commit ec3165320e81ac87edcb85c86c452528ddbaec1c) Co-authored-by: Dong-hee Na <donghee.na@python.org>
-rw-r--r--Lib/test/test_nntplib.py10
-rw-r--r--Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst2
2 files changed, 9 insertions, 3 deletions
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 1d1750a5be2..fdfa64424af 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -84,7 +84,7 @@ class NetworkedNNTPTestsMixin:
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)
@@ -296,6 +296,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
@@ -329,8 +330,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)
diff --git a/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst b/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
new file mode 100644
index 00000000000..577f2259e1f
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
@@ -0,0 +1,2 @@
+Update test_nntplib to use offical group name of news.aioe.org for testing.
+Patch by Dong-hee Na.