Backport test_nntplib fixes from default.

This commit is contained in:
Antoine Pitrou 2012-06-25 18:08:54 +02:00
parent 62ba0428af
commit 1dd75a64aa
1 changed files with 5 additions and 2 deletions

View File

@ -177,9 +177,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