From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 17 Jun 2012 11:27:18 +0000 (+1000)
Subject: Ignore X-Antivirus headers in test_nntplib
X-Git-Tag: v3.3.0b1~204^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14d99a14912343061463049e814a15127e79c69e;p=thirdparty%2FPython%2Fcpython.git

Ignore X-Antivirus headers in test_nntplib
---

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index cc490f1e97ed..86827f37f5be 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 53b596696c76..446688c01a05 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