mirror of
https://github.com/python/cpython.git
synced 2025-07-15 23:35:23 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r62194 | jeffrey.yasskin | 2008-04-07 01:04:28 +0200 (Mon, 07 Apr 2008) | 7 lines Add enough debugging information to diagnose failures where the HandlerBException is ignored, and fix one such problem, where it was thrown during the __del__ method of the previous Popen object. We may want to find a better way of printing verbose information so it's not spammy when the test passes. ........ r62197 | mark.hammond | 2008-04-07 03:53:39 +0200 (Mon, 07 Apr 2008) | 2 lines Issue #2513: enable 64bit cross compilation on windows. ........ r62198 | mark.hammond | 2008-04-07 03:59:40 +0200 (Mon, 07 Apr 2008) | 2 lines correct heading underline for new "Cross-compiling on Windows" section ........ r62204 | gregory.p.smith | 2008-04-07 08:33:21 +0200 (Mon, 07 Apr 2008) | 4 lines Use the new PyFile_IncUseCount & PyFile_DecUseCount calls appropriatly within the standard library. These modules use PyFile_AsFile and later release the GIL while operating on the previously returned FILE*. ........ r62205 | mark.summerfield | 2008-04-07 09:39:23 +0200 (Mon, 07 Apr 2008) | 4 lines changed "2500 components" to "several thousand" since the number keeps growning:-) ........ r62214 | georg.brandl | 2008-04-07 20:51:59 +0200 (Mon, 07 Apr 2008) | 2 lines #2525: update timezone info examples in the docs. ........ r62219 | andrew.kuchling | 2008-04-08 01:57:07 +0200 (Tue, 08 Apr 2008) | 1 line Write PEP 3127 section; add items ........ r62220 | andrew.kuchling | 2008-04-08 01:57:21 +0200 (Tue, 08 Apr 2008) | 1 line Typo fix ........ r62221 | andrew.kuchling | 2008-04-08 03:33:10 +0200 (Tue, 08 Apr 2008) | 1 line Typographical fix: 32bit -> 32-bit, 64bit -> 64-bit ........ r62227 | andrew.kuchling | 2008-04-08 23:22:53 +0200 (Tue, 08 Apr 2008) | 1 line Add items ........ r62229 | amaury.forgeotdarc | 2008-04-08 23:27:42 +0200 (Tue, 08 Apr 2008) | 7 lines Issue2564: Prevent a hang in "import test.autotest", which runs the entire test suite as a side-effect of importing the module. - in test_capi, a thread tried to import other modules - re.compile() imported sre_parse again on every call. ........ r62230 | amaury.forgeotdarc | 2008-04-08 23:51:57 +0200 (Tue, 08 Apr 2008) | 2 lines Prevent an error when inspect.isabstract() is called with something else than a new-style class. ........ r62231 | amaury.forgeotdarc | 2008-04-09 00:07:05 +0200 (Wed, 09 Apr 2008) | 8 lines Issue 2408: remove the _types module It was only used as a helper in types.py to access types (GetSetDescriptorType and MemberDescriptorType), when they can easily be obtained with python code. These expressions even work with Jython. I don't know what the future of the types module is; (cf. discussion in http://bugs.python.org/issue1605 ) at least this change makes it simpler. ........ r62233 | amaury.forgeotdarc | 2008-04-09 01:10:07 +0200 (Wed, 09 Apr 2008) | 2 lines Add a NEWS entry for previous checkin ........ r62234 | trent.nelson | 2008-04-09 01:47:30 +0200 (Wed, 09 Apr 2008) | 37 lines - Issue #2550: The approach used by client/server code for obtaining ports to listen on in network-oriented tests has been refined in an effort to facilitate running multiple instances of the entire regression test suite in parallel without issue. test_support.bind_port() has been fixed such that it will always return a unique port -- which wasn't always the case with the previous implementation, especially if socket options had been set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The new implementation of bind_port() will actually raise an exception if it is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or SO_REUSEPORT socket option set. Furthermore, if available, bind_port() will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed. This currently only applies to Windows. This option prevents any other sockets from binding to the host/port we've bound to, thus removing the possibility of the 'non-deterministic' behaviour, as Microsoft puts it, that occurs when a second SOCK_STREAM socket binds and accepts to a host/port that's already been bound by another socket. The optional preferred port parameter to bind_port() has been removed. Under no circumstances should tests be hard coding ports! test_support.find_unused_port() has also been introduced, which will pass a temporary socket object to bind_port() in order to obtain an unused port. The temporary socket object is then closed and deleted, and the port is returned. This method should only be used for obtaining an unused port in order to pass to an external program (i.e. the -accept [port] argument to openssl's s_server mode) or as a parameter to a server-oriented class that doesn't give you direct access to the underlying socket used. Finally, test_support.HOST has been introduced, which should be used for the host argument of any relevant socket calls (i.e. bind and connect). The following tests were updated to following the new conventions: test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib, test_poplib, test_ftplib, test_telnetlib, test_socketserver, test_asynchat and test_socket_ssl. It is now possible for multiple instances of the regression test suite to run in parallel without issue. ........ r62235 | gregory.p.smith | 2008-04-09 02:25:17 +0200 (Wed, 09 Apr 2008) | 3 lines Fix zlib crash from zlib.decompressobj().flush(val) when val was not positive. It tried to allocate negative or zero memory. That fails. ........ r62237 | trent.nelson | 2008-04-09 02:34:53 +0200 (Wed, 09 Apr 2008) | 1 line Fix typo with regards to self.PORT shadowing class variables with the same name. ........ r62238 | andrew.kuchling | 2008-04-09 03:08:32 +0200 (Wed, 09 Apr 2008) | 1 line Add items ........ r62239 | jerry.seutter | 2008-04-09 07:07:58 +0200 (Wed, 09 Apr 2008) | 1 line Changed test so it no longer runs as a side effect of importing. ........
413 lines
12 KiB
Python
413 lines
12 KiB
Python
import asyncore
|
|
import unittest
|
|
import select
|
|
import os
|
|
import socket
|
|
import threading
|
|
import sys
|
|
import time
|
|
|
|
from test import test_support
|
|
from test.test_support import TESTFN, run_unittest, unlink
|
|
from io import BytesIO
|
|
from io import StringIO
|
|
|
|
HOST = test_support.HOST
|
|
|
|
class dummysocket:
|
|
def __init__(self):
|
|
self.closed = False
|
|
|
|
def close(self):
|
|
self.closed = True
|
|
|
|
def fileno(self):
|
|
return 42
|
|
|
|
class dummychannel:
|
|
def __init__(self):
|
|
self.socket = dummysocket()
|
|
|
|
class exitingdummy:
|
|
def __init__(self):
|
|
pass
|
|
|
|
def handle_read_event(self):
|
|
raise asyncore.ExitNow()
|
|
|
|
handle_write_event = handle_read_event
|
|
handle_expt_event = handle_read_event
|
|
|
|
class crashingdummy:
|
|
def __init__(self):
|
|
self.error_handled = False
|
|
|
|
def handle_read_event(self):
|
|
raise Exception()
|
|
|
|
handle_write_event = handle_read_event
|
|
handle_expt_event = handle_read_event
|
|
|
|
def handle_error(self):
|
|
self.error_handled = True
|
|
|
|
# used when testing senders; just collects what it gets until newline is sent
|
|
def capture_server(evt, buf, serv):
|
|
try:
|
|
serv.listen(5)
|
|
conn, addr = serv.accept()
|
|
except socket.timeout:
|
|
pass
|
|
else:
|
|
n = 200
|
|
while n > 0:
|
|
r, w, e = select.select([conn], [], [])
|
|
if r:
|
|
data = conn.recv(10)
|
|
# keep everything except for the newline terminator
|
|
buf.write(data.replace(b'\n', b''))
|
|
if b'\n' in data:
|
|
break
|
|
n -= 1
|
|
time.sleep(0.01)
|
|
|
|
conn.close()
|
|
finally:
|
|
serv.close()
|
|
evt.set()
|
|
|
|
|
|
class HelperFunctionTests(unittest.TestCase):
|
|
def test_readwriteexc(self):
|
|
# Check exception handling behavior of read, write and _exception
|
|
|
|
# check that ExitNow exceptions in the object handler method
|
|
# bubbles all the way up through asyncore read/write/_exception calls
|
|
tr1 = exitingdummy()
|
|
self.assertRaises(asyncore.ExitNow, asyncore.read, tr1)
|
|
self.assertRaises(asyncore.ExitNow, asyncore.write, tr1)
|
|
self.assertRaises(asyncore.ExitNow, asyncore._exception, tr1)
|
|
|
|
# check that an exception other than ExitNow in the object handler
|
|
# method causes the handle_error method to get called
|
|
tr2 = crashingdummy()
|
|
asyncore.read(tr2)
|
|
self.assertEqual(tr2.error_handled, True)
|
|
|
|
tr2 = crashingdummy()
|
|
asyncore.write(tr2)
|
|
self.assertEqual(tr2.error_handled, True)
|
|
|
|
tr2 = crashingdummy()
|
|
asyncore._exception(tr2)
|
|
self.assertEqual(tr2.error_handled, True)
|
|
|
|
# asyncore.readwrite uses constants in the select module that
|
|
# are not present in Windows systems (see this thread:
|
|
# http://mail.python.org/pipermail/python-list/2001-October/109973.html)
|
|
# These constants should be present as long as poll is available
|
|
|
|
if hasattr(select, 'poll'):
|
|
def test_readwrite(self):
|
|
# Check that correct methods are called by readwrite()
|
|
|
|
class testobj:
|
|
def __init__(self):
|
|
self.read = False
|
|
self.write = False
|
|
self.expt = False
|
|
|
|
def handle_read_event(self):
|
|
self.read = True
|
|
|
|
def handle_write_event(self):
|
|
self.write = True
|
|
|
|
def handle_expt_event(self):
|
|
self.expt = True
|
|
|
|
def handle_error(self):
|
|
self.error_handled = True
|
|
|
|
for flag in (select.POLLIN, select.POLLPRI):
|
|
tobj = testobj()
|
|
self.assertEqual(tobj.read, False)
|
|
asyncore.readwrite(tobj, flag)
|
|
self.assertEqual(tobj.read, True)
|
|
|
|
# check that ExitNow exceptions in the object handler method
|
|
# bubbles all the way up through asyncore readwrite call
|
|
tr1 = exitingdummy()
|
|
self.assertRaises(asyncore.ExitNow, asyncore.readwrite, tr1, flag)
|
|
|
|
# check that an exception other than ExitNow in the object handler
|
|
# method causes the handle_error method to get called
|
|
tr2 = crashingdummy()
|
|
asyncore.readwrite(tr2, flag)
|
|
self.assertEqual(tr2.error_handled, True)
|
|
|
|
tobj = testobj()
|
|
self.assertEqual(tobj.write, False)
|
|
asyncore.readwrite(tobj, select.POLLOUT)
|
|
self.assertEqual(tobj.write, True)
|
|
|
|
# check that ExitNow exceptions in the object handler method
|
|
# bubbles all the way up through asyncore readwrite call
|
|
tr1 = exitingdummy()
|
|
self.assertRaises(asyncore.ExitNow, asyncore.readwrite, tr1,
|
|
select.POLLOUT)
|
|
|
|
# check that an exception other than ExitNow in the object handler
|
|
# method causes the handle_error method to get called
|
|
tr2 = crashingdummy()
|
|
asyncore.readwrite(tr2, select.POLLOUT)
|
|
self.assertEqual(tr2.error_handled, True)
|
|
|
|
for flag in (select.POLLERR, select.POLLHUP, select.POLLNVAL):
|
|
tobj = testobj()
|
|
self.assertEqual(tobj.expt, False)
|
|
asyncore.readwrite(tobj, flag)
|
|
self.assertEqual(tobj.expt, True)
|
|
|
|
# check that ExitNow exceptions in the object handler method
|
|
# bubbles all the way up through asyncore readwrite calls
|
|
tr1 = exitingdummy()
|
|
self.assertRaises(asyncore.ExitNow, asyncore.readwrite, tr1, flag)
|
|
|
|
# check that an exception other than ExitNow in the object handler
|
|
# method causes the handle_error method to get called
|
|
tr2 = crashingdummy()
|
|
asyncore.readwrite(tr2, flag)
|
|
self.assertEqual(tr2.error_handled, True)
|
|
|
|
def test_closeall(self):
|
|
self.closeall_check(False)
|
|
|
|
def test_closeall_default(self):
|
|
self.closeall_check(True)
|
|
|
|
def closeall_check(self, usedefault):
|
|
# Check that close_all() closes everything in a given map
|
|
|
|
l = []
|
|
testmap = {}
|
|
for i in range(10):
|
|
c = dummychannel()
|
|
l.append(c)
|
|
self.assertEqual(c.socket.closed, False)
|
|
testmap[i] = c
|
|
|
|
if usedefault:
|
|
socketmap = asyncore.socket_map
|
|
try:
|
|
asyncore.socket_map = testmap
|
|
asyncore.close_all()
|
|
finally:
|
|
testmap, asyncore.socket_map = asyncore.socket_map, socketmap
|
|
else:
|
|
asyncore.close_all(testmap)
|
|
|
|
self.assertEqual(len(testmap), 0)
|
|
|
|
for c in l:
|
|
self.assertEqual(c.socket.closed, True)
|
|
|
|
def test_compact_traceback(self):
|
|
try:
|
|
raise Exception("I don't like spam!")
|
|
except:
|
|
real_t, real_v, real_tb = sys.exc_info()
|
|
r = asyncore.compact_traceback()
|
|
else:
|
|
self.fail("Expected exception")
|
|
|
|
(f, function, line), t, v, info = r
|
|
self.assertEqual(os.path.split(f)[-1], 'test_asyncore.py')
|
|
self.assertEqual(function, 'test_compact_traceback')
|
|
self.assertEqual(t, real_t)
|
|
self.assertEqual(v, real_v)
|
|
self.assertEqual(info, '[%s|%s|%s]' % (f, function, line))
|
|
|
|
|
|
class DispatcherTests(unittest.TestCase):
|
|
def setUp(self):
|
|
pass
|
|
|
|
def tearDown(self):
|
|
asyncore.close_all()
|
|
|
|
def test_basic(self):
|
|
d = asyncore.dispatcher()
|
|
self.assertEqual(d.readable(), True)
|
|
self.assertEqual(d.writable(), True)
|
|
|
|
def test_repr(self):
|
|
d = asyncore.dispatcher()
|
|
self.assertEqual(repr(d), '<asyncore.dispatcher at %#x>' % id(d))
|
|
|
|
def test_log(self):
|
|
d = asyncore.dispatcher()
|
|
|
|
# capture output of dispatcher.log() (to stderr)
|
|
fp = StringIO()
|
|
stderr = sys.stderr
|
|
l1 = "Lovely spam! Wonderful spam!"
|
|
l2 = "I don't like spam!"
|
|
try:
|
|
sys.stderr = fp
|
|
d.log(l1)
|
|
d.log(l2)
|
|
finally:
|
|
sys.stderr = stderr
|
|
|
|
lines = fp.getvalue().splitlines()
|
|
self.assertEquals(lines, ['log: %s' % l1, 'log: %s' % l2])
|
|
|
|
def test_log_info(self):
|
|
d = asyncore.dispatcher()
|
|
|
|
# capture output of dispatcher.log_info() (to stdout via print)
|
|
fp = StringIO()
|
|
stdout = sys.stdout
|
|
l1 = "Have you got anything without spam?"
|
|
l2 = "Why can't she have egg bacon spam and sausage?"
|
|
l3 = "THAT'S got spam in it!"
|
|
try:
|
|
sys.stdout = fp
|
|
d.log_info(l1, 'EGGS')
|
|
d.log_info(l2)
|
|
d.log_info(l3, 'SPAM')
|
|
finally:
|
|
sys.stdout = stdout
|
|
|
|
lines = fp.getvalue().splitlines()
|
|
if __debug__:
|
|
expected = ['EGGS: %s' % l1, 'info: %s' % l2, 'SPAM: %s' % l3]
|
|
else:
|
|
expected = ['EGGS: %s' % l1, 'SPAM: %s' % l3]
|
|
|
|
self.assertEquals(lines, expected)
|
|
|
|
def test_unhandled(self):
|
|
d = asyncore.dispatcher()
|
|
|
|
# capture output of dispatcher.log_info() (to stdout via print)
|
|
fp = StringIO()
|
|
stdout = sys.stdout
|
|
try:
|
|
sys.stdout = fp
|
|
d.handle_expt()
|
|
d.handle_read()
|
|
d.handle_write()
|
|
d.handle_connect()
|
|
d.handle_accept()
|
|
finally:
|
|
sys.stdout = stdout
|
|
|
|
lines = fp.getvalue().splitlines()
|
|
expected = ['warning: unhandled exception',
|
|
'warning: unhandled read event',
|
|
'warning: unhandled write event',
|
|
'warning: unhandled connect event',
|
|
'warning: unhandled accept event']
|
|
self.assertEquals(lines, expected)
|
|
|
|
|
|
|
|
class dispatcherwithsend_noread(asyncore.dispatcher_with_send):
|
|
def readable(self):
|
|
return False
|
|
|
|
def handle_connect(self):
|
|
pass
|
|
|
|
class DispatcherWithSendTests(unittest.TestCase):
|
|
usepoll = False
|
|
|
|
def setUp(self):
|
|
pass
|
|
|
|
def tearDown(self):
|
|
asyncore.close_all()
|
|
|
|
def test_send(self):
|
|
self.evt = threading.Event()
|
|
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
self.sock.settimeout(3)
|
|
self.port = test_support.bind_port(self.sock)
|
|
|
|
cap = BytesIO()
|
|
args = (self.evt, cap, self.sock)
|
|
threading.Thread(target=capture_server, args=args).start()
|
|
|
|
# wait a little longer for the server to initialize (it sometimes
|
|
# refuses connections on slow machines without this wait)
|
|
time.sleep(0.2)
|
|
|
|
data = b"Suppose there isn't a 16-ton weight?"
|
|
d = dispatcherwithsend_noread()
|
|
d.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
d.connect((HOST, self.port))
|
|
|
|
# give time for socket to connect
|
|
time.sleep(0.1)
|
|
|
|
d.send(data)
|
|
d.send(data)
|
|
d.send(b'\n')
|
|
|
|
n = 1000
|
|
while d.out_buffer and n > 0:
|
|
asyncore.poll()
|
|
n -= 1
|
|
|
|
self.evt.wait()
|
|
|
|
self.assertEqual(cap.getvalue(), data*2)
|
|
|
|
|
|
class DispatcherWithSendTests_UsePoll(DispatcherWithSendTests):
|
|
usepoll = True
|
|
|
|
if hasattr(asyncore, 'file_wrapper'):
|
|
class FileWrapperTest(unittest.TestCase):
|
|
def setUp(self):
|
|
self.d = "It's not dead, it's sleeping!"
|
|
open(TESTFN, 'w').write(self.d)
|
|
|
|
def tearDown(self):
|
|
unlink(TESTFN)
|
|
|
|
def test_recv(self):
|
|
fd = os.open(TESTFN, os.O_RDONLY)
|
|
w = asyncore.file_wrapper(fd)
|
|
|
|
self.assertEqual(w.fd, fd)
|
|
self.assertEqual(w.fileno(), fd)
|
|
self.assertEqual(w.recv(13), b"It's not dead")
|
|
self.assertEqual(w.read(6), b", it's")
|
|
w.close()
|
|
self.assertRaises(OSError, w.read, 1)
|
|
|
|
def test_send(self):
|
|
d1 = "Come again?"
|
|
d2 = "I want to buy some cheese."
|
|
fd = os.open(TESTFN, os.O_WRONLY | os.O_APPEND)
|
|
w = asyncore.file_wrapper(fd)
|
|
|
|
w.write(d1)
|
|
w.send(d2)
|
|
w.close()
|
|
self.assertEqual(open(TESTFN).read(), self.d + d1 + d2)
|
|
|
|
|
|
def test_main():
|
|
tests = [HelperFunctionTests, DispatcherTests, DispatcherWithSendTests,
|
|
DispatcherWithSendTests_UsePoll]
|
|
if hasattr(asyncore, 'file_wrapper'):
|
|
tests.append(FileWrapperTest)
|
|
|
|
run_unittest(*tests)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|