From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 24 Jun 2012 14:28:18 +0000 (+0200)
Subject: Fix test to really run behind a NNTP virus checker
X-Git-Tag: v3.3.0b1~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f5d2a087c715eec5972800e1fa9c5a4daac32d2;p=thirdparty%2FPython%2Fcpython.git

Fix test to really run behind a NNTP virus checker
---

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index e1155236787e..19fb10a9c716 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -178,9 +178,12 @@ class NetworkedNNTPTestsMixin:
         self.assertTrue(resp.startswith("220 "), resp)
         self.check_article_resp(resp, article, art_num)
         # Tolerate running the tests from behind a NNTP virus checker
+        blacklist = lambda line: line.startswith(b'X-Antivirus')
+        filtered_head_lines = [line for line in head.lines
+                               if not blacklist(line)]
         filtered_lines = [line for line in article.lines
-                                  if not line.startswith(b'X-Antivirus')]
-        self.assertEqual(filtered_lines, head.lines + [b''] + body.lines)
+                          if not blacklist(line)]
+        self.assertEqual(filtered_lines, filtered_head_lines + [b''] + body.lines)
 
     def test_capabilities(self):
         # The server under test implements NNTP version 2 and has a