From 14d99a14912343061463049e814a15127e79c69e Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Sun, 17 Jun 2012 21:27:18 +1000 Subject: [PATCH] Ignore X-Antivirus headers in test_nntplib --- Lib/test/test_nntplib.py | 5 ++++- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index cc490f1e97e..86827f37f5b 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -176,7 +176,10 @@ class NetworkedNNTPTestsMixin: resp, article = self.server.article(art_num) self.assertTrue(resp.startswith("220 "), resp) self.check_article_resp(resp, article, art_num) - self.assertEqual(article.lines, head.lines + [b''] + body.lines) + # Tolerate running the tests from behind a NNTP virus checker + filtered_lines = [line for line in article.lines + if not line.startswith(b'X-Antivirus')] + self.assertEqual(filtered_lines, head.lines + [b''] + body.lines) def test_capabilities(self): # The server under test implements NNTP version 2 and has a diff --git a/Misc/NEWS b/Misc/NEWS index 53b596696c7..446688c01a0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -301,6 +301,9 @@ Extension Modules Tests ----- +- test_nntplib now tolerates being run from behind NNTP gateways that add + "X-Antivirus" headers to articles + - Issue #15043: test_gdb is now skipped entirely if gdb security settings block loading of the gdb hooks