]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Fix test to really run behind a NNTP virus checker
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 24 Jun 2012 14:28:18 +0000 (16:28 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 24 Jun 2012 14:28:18 +0000 (16:28 +0200)
Lib/test/test_nntplib.py

index e1155236787ee713176a8ff303537cb871f6644e..19fb10a9c71678778382da2a42cd8b4ec8b57a32 100644 (file)
@@ -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