Merge from 3.2 (Ignore X-Antivirus headers in test_nntplib)

ncoghlan · ncoghlan · commit 307ef8aee5a7 · 2012-06-17T21:30:35.000+10:00
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
@@ -177,7 +177,10 @@ def test_article_head_body(self):
         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
@@ -134,6 +134,9 @@ Documentation
 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
 
