mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
merge with 3.3
This commit is contained in:
commit
b89b5df9c9
13 changed files with 191 additions and 38 deletions
|
@ -584,6 +584,11 @@ class NNTPv1Handler:
|
|||
<a4929a40-6328-491a-aaaf-cb79ed7309a2@q2g2000vbk.googlegroups.com>
|
||||
<f30c0419-f549-4218-848f-d7d0131da931@y3g2000vbm.googlegroups.com>
|
||||
.""")
|
||||
elif (group == 'comp.lang.python' and
|
||||
date_str in ('20100101', '100101') and
|
||||
time_str == '090000'):
|
||||
self.push_lit('too long line' * 3000 +
|
||||
'\n.')
|
||||
else:
|
||||
self.push_lit("""\
|
||||
230 An empty list of newsarticles follows
|
||||
|
@ -1179,6 +1184,11 @@ class NNTPv1v2TestsMixin:
|
|||
self.assertEqual(cm.exception.response,
|
||||
"435 Article not wanted")
|
||||
|
||||
def test_too_long_lines(self):
|
||||
dt = datetime.datetime(2010, 1, 1, 9, 0, 0)
|
||||
self.assertRaises(nntplib.NNTPDataError,
|
||||
self.server.newnews, "comp.lang.python", dt)
|
||||
|
||||
|
||||
class NNTPv1Tests(NNTPv1v2TestsMixin, MockedNNTPTestsMixin, unittest.TestCase):
|
||||
"""Tests an NNTP v1 server (no capabilities)."""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue