mirror of
https://github.com/python/cpython.git
synced 2024-11-25 10:54:51 +08:00
5e69685999
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. ........
256 lines
8.1 KiB
Python
256 lines
8.1 KiB
Python
# test asynchat -- requires threading
|
|
|
|
import thread # If this fails, we can't test this module
|
|
import asyncore, asynchat, socket, threading, time
|
|
import unittest
|
|
import sys
|
|
from test import test_support
|
|
|
|
HOST = test_support.HOST
|
|
SERVER_QUIT = b'QUIT\n'
|
|
|
|
class echo_server(threading.Thread):
|
|
# parameter to determine the number of bytes passed back to the
|
|
# client each send
|
|
chunk_size = 1
|
|
|
|
def __init__(self, event):
|
|
threading.Thread.__init__(self)
|
|
self.event = event
|
|
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
self.port = test_support.bind_port(self.sock)
|
|
|
|
def run(self):
|
|
self.sock.listen(1)
|
|
self.event.set()
|
|
conn, client = self.sock.accept()
|
|
self.buffer = b""
|
|
# collect data until quit message is seen
|
|
while SERVER_QUIT not in self.buffer:
|
|
data = conn.recv(1)
|
|
if not data:
|
|
break
|
|
self.buffer = self.buffer + data
|
|
|
|
# remove the SERVER_QUIT message
|
|
self.buffer = self.buffer.replace(SERVER_QUIT, b'')
|
|
|
|
# re-send entire set of collected data
|
|
try:
|
|
# this may fail on some tests, such as test_close_when_done, since
|
|
# the client closes the channel when it's done sending
|
|
while self.buffer:
|
|
n = conn.send(self.buffer[:self.chunk_size])
|
|
time.sleep(0.001)
|
|
self.buffer = self.buffer[n:]
|
|
except:
|
|
pass
|
|
|
|
conn.close()
|
|
self.sock.close()
|
|
|
|
class echo_client(asynchat.async_chat):
|
|
|
|
def __init__(self, terminator, server_port):
|
|
asynchat.async_chat.__init__(self)
|
|
self.contents = []
|
|
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
self.connect((HOST, server_port))
|
|
self.set_terminator(terminator)
|
|
self.buffer = b""
|
|
|
|
def handle_connect(self):
|
|
pass
|
|
|
|
if sys.platform == 'darwin':
|
|
# select.poll returns a select.POLLHUP at the end of the tests
|
|
# on darwin, so just ignore it
|
|
def handle_expt(self):
|
|
pass
|
|
|
|
def collect_incoming_data(self, data):
|
|
self.buffer += data
|
|
|
|
def found_terminator(self):
|
|
self.contents.append(self.buffer)
|
|
self.buffer = b""
|
|
|
|
|
|
def start_echo_server():
|
|
event = threading.Event()
|
|
s = echo_server(event)
|
|
s.start()
|
|
event.wait()
|
|
event.clear()
|
|
time.sleep(0.01) # Give server time to start accepting.
|
|
return s, event
|
|
|
|
|
|
class TestAsynchat(unittest.TestCase):
|
|
usepoll = False
|
|
|
|
def setUp (self):
|
|
pass
|
|
|
|
def tearDown (self):
|
|
pass
|
|
|
|
def line_terminator_check(self, term, server_chunk):
|
|
event = threading.Event()
|
|
s = echo_server(event)
|
|
s.chunk_size = server_chunk
|
|
s.start()
|
|
event.wait()
|
|
event.clear()
|
|
time.sleep(0.01) # Give server time to start accepting.
|
|
c = echo_client(term, s.port)
|
|
c.push(b"hello ")
|
|
c.push(bytes("world%s" % term, "ascii"))
|
|
c.push(bytes("I'm not dead yet!%s" % term, "ascii"))
|
|
c.push(SERVER_QUIT)
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents, [b"hello world", b"I'm not dead yet!"])
|
|
|
|
# the line terminator tests below check receiving variously-sized
|
|
# chunks back from the server in order to exercise all branches of
|
|
# async_chat.handle_read
|
|
|
|
def test_line_terminator1(self):
|
|
# test one-character terminator
|
|
for l in (1,2,3):
|
|
self.line_terminator_check('\n', l)
|
|
|
|
def test_line_terminator2(self):
|
|
# test two-character terminator
|
|
for l in (1,2,3):
|
|
self.line_terminator_check('\r\n', l)
|
|
|
|
def test_line_terminator3(self):
|
|
# test three-character terminator
|
|
for l in (1,2,3):
|
|
self.line_terminator_check('qqq', l)
|
|
|
|
def numeric_terminator_check(self, termlen):
|
|
# Try reading a fixed number of bytes
|
|
s, event = start_echo_server()
|
|
c = echo_client(termlen, s.port)
|
|
data = b"hello world, I'm not dead yet!\n"
|
|
c.push(data)
|
|
c.push(SERVER_QUIT)
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents, [data[:termlen]])
|
|
|
|
def test_numeric_terminator1(self):
|
|
# check that ints & longs both work (since type is
|
|
# explicitly checked in async_chat.handle_read)
|
|
self.numeric_terminator_check(1)
|
|
|
|
def test_numeric_terminator2(self):
|
|
self.numeric_terminator_check(6)
|
|
|
|
def test_none_terminator(self):
|
|
# Try reading a fixed number of bytes
|
|
s, event = start_echo_server()
|
|
c = echo_client(None, s.port)
|
|
data = b"hello world, I'm not dead yet!\n"
|
|
c.push(data)
|
|
c.push(SERVER_QUIT)
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents, [])
|
|
self.assertEqual(c.buffer, data)
|
|
|
|
def test_simple_producer(self):
|
|
s, event = start_echo_server()
|
|
c = echo_client(b'\n', s.port)
|
|
data = b"hello world\nI'm not dead yet!\n"
|
|
p = asynchat.simple_producer(data+SERVER_QUIT, buffer_size=8)
|
|
c.push_with_producer(p)
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents, [b"hello world", b"I'm not dead yet!"])
|
|
|
|
def test_string_producer(self):
|
|
s, event = start_echo_server()
|
|
c = echo_client(b'\n', s.port)
|
|
data = b"hello world\nI'm not dead yet!\n"
|
|
c.push_with_producer(data+SERVER_QUIT)
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents, [b"hello world", b"I'm not dead yet!"])
|
|
|
|
def test_empty_line(self):
|
|
# checks that empty lines are handled correctly
|
|
s, event = start_echo_server()
|
|
c = echo_client(b'\n', s.port)
|
|
c.push("hello world\n\nI'm not dead yet!\n")
|
|
c.push(SERVER_QUIT)
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents,
|
|
[b"hello world", b"", b"I'm not dead yet!"])
|
|
|
|
def test_close_when_done(self):
|
|
s, event = start_echo_server()
|
|
c = echo_client(b'\n', s.port)
|
|
c.push("hello world\nI'm not dead yet!\n")
|
|
c.push(SERVER_QUIT)
|
|
c.close_when_done()
|
|
asyncore.loop(use_poll=self.usepoll, count=300, timeout=.01)
|
|
s.join()
|
|
|
|
self.assertEqual(c.contents, [])
|
|
# the server might have been able to send a byte or two back, but this
|
|
# at least checks that it received something and didn't just fail
|
|
# (which could still result in the client not having received anything)
|
|
self.assertTrue(len(s.buffer) > 0)
|
|
|
|
|
|
class TestAsynchat_WithPoll(TestAsynchat):
|
|
usepoll = True
|
|
|
|
class TestHelperFunctions(unittest.TestCase):
|
|
def test_find_prefix_at_end(self):
|
|
self.assertEqual(asynchat.find_prefix_at_end("qwerty\r", "\r\n"), 1)
|
|
self.assertEqual(asynchat.find_prefix_at_end("qwertydkjf", "\r\n"), 0)
|
|
|
|
class TestFifo(unittest.TestCase):
|
|
def test_basic(self):
|
|
f = asynchat.fifo()
|
|
f.push(7)
|
|
f.push(b'a')
|
|
self.assertEqual(len(f), 2)
|
|
self.assertEqual(f.first(), 7)
|
|
self.assertEqual(f.pop(), (1, 7))
|
|
self.assertEqual(len(f), 1)
|
|
self.assertEqual(f.first(), b'a')
|
|
self.assertEqual(f.is_empty(), False)
|
|
self.assertEqual(f.pop(), (1, b'a'))
|
|
self.assertEqual(len(f), 0)
|
|
self.assertEqual(f.is_empty(), True)
|
|
self.assertEqual(f.pop(), (0, None))
|
|
|
|
def test_given_list(self):
|
|
f = asynchat.fifo([b'x', 17, 3])
|
|
self.assertEqual(len(f), 3)
|
|
self.assertEqual(f.pop(), (1, b'x'))
|
|
self.assertEqual(f.pop(), (1, 17))
|
|
self.assertEqual(f.pop(), (1, 3))
|
|
self.assertEqual(f.pop(), (0, None))
|
|
|
|
|
|
def test_main(verbose=None):
|
|
test_support.run_unittest(TestAsynchat, TestAsynchat_WithPoll,
|
|
TestHelperFunctions, TestFifo)
|
|
|
|
if __name__ == "__main__":
|
|
test_main(verbose=True)
|