[Python-checkins] cpython (3.2): Backport test_nntplib fixes from default.

Mon Jun 25 18:12:56 CEST 2012

http://hg.python.org/cpython/rev/40cc55770988
changeset: 77778:40cc55770988
branch: 3.2
parent: 77774:334ff92a8483
user: Antoine Pitrou <solipsis at pitrou.net>
date: Mon Jun 25 18:08:54 2012 +0200
summary:
 Backport test_nntplib fixes from default.
files:
 Lib/test/test_nntplib.py | 7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -177,9 +177,12 @@
 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
-- 
Repository URL: http://hg.python.org/cpython
