mirror of
https://github.com/python/cpython.git
synced 2024-11-26 03:14:27 +08:00
af98da18c0
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60286 | christian.heimes | 2008-01-25 15:54:23 +0100 (Fri, 25 Jan 2008) | 1 line setup.py doesn't pick up changes to a header file ........ r60287 | christian.heimes | 2008-01-25 16:52:11 +0100 (Fri, 25 Jan 2008) | 2 lines Added the Python core headers Include/*.h and pyconfig.h as dependencies for the extensions in Modules/ It forces a rebuild of all extensions when a header files has been modified ........ r60291 | raymond.hettinger | 2008-01-25 20:24:46 +0100 (Fri, 25 Jan 2008) | 4 lines Changes 54857 and 54840 broke code and were reverted in Py2.5 just before it was released, but that reversion never made it to the Py2.6 head. ........ r60296 | guido.van.rossum | 2008-01-25 20:50:26 +0100 (Fri, 25 Jan 2008) | 2 lines Rewrite the list_inline_repeat overflow check slightly differently. ........ r60301 | thomas.wouters | 2008-01-25 22:09:34 +0100 (Fri, 25 Jan 2008) | 4 lines Use the right (portable) definition of the max of a Py_ssize_t. ........ r60303 | thomas.wouters | 2008-01-26 02:47:05 +0100 (Sat, 26 Jan 2008) | 5 lines Make 'testall' work again when building in a separate directory. test_distutils still fails when doing that. ........ r60305 | neal.norwitz | 2008-01-26 06:54:48 +0100 (Sat, 26 Jan 2008) | 3 lines Prevent this test from failing if there are transient network problems by retrying the host for up to 3 times. ........ r60306 | neal.norwitz | 2008-01-26 08:26:12 +0100 (Sat, 26 Jan 2008) | 12 lines Use a condition variable (threading.Event) rather than sleeps and checking a global to determine when the server is ready to be used. This slows the test down, but should make it correct. There was a race condition before where the server could have assigned a port, yet it wasn't ready to serve requests. If the client sent a request before the server was completely ready, it would get an exception. There was machinery to try to handle this condition. All of that should be unnecessary and removed if this change works. A NOTE was added as a comment about what needs to be fixed. The buildbots will tell us if there are more errors or if this test is now stable. ........ r60307 | neal.norwitz | 2008-01-26 08:38:03 +0100 (Sat, 26 Jan 2008) | 3 lines Fix exception in tearDown on ppc buildbot. If there's no directory, that shouldn't cause the test to fail. Just like it setUp. ........ r60308 | raymond.hettinger | 2008-01-26 09:19:06 +0100 (Sat, 26 Jan 2008) | 3 lines Make PySet_Add() work with frozensets. Works like PyTuple_SetItem() to build-up values in a brand new frozenset. ........ r60309 | neal.norwitz | 2008-01-26 09:26:00 +0100 (Sat, 26 Jan 2008) | 1 line The OS X buildbot had errors with the unavailable exceptions disabled. Restore it. ........ r60310 | raymond.hettinger | 2008-01-26 09:37:28 +0100 (Sat, 26 Jan 2008) | 4 lines Let marshal build-up sets and frozensets one element at a time. Saves the unnecessary creation of a tuple as intermediate container. ........ r60311 | raymond.hettinger | 2008-01-26 09:41:13 +0100 (Sat, 26 Jan 2008) | 1 line Update test code for change to PySet_Add(). ........ r60312 | raymond.hettinger | 2008-01-26 10:31:11 +0100 (Sat, 26 Jan 2008) | 1 line Revert PySet_Add() changes. ........ r60314 | georg.brandl | 2008-01-26 10:43:35 +0100 (Sat, 26 Jan 2008) | 2 lines #1934: fix os.path.isabs docs. ........ r60316 | georg.brandl | 2008-01-26 12:00:18 +0100 (Sat, 26 Jan 2008) | 2 lines Add missing things in re docstring. ........ r60317 | georg.brandl | 2008-01-26 12:02:22 +0100 (Sat, 26 Jan 2008) | 2 lines Slashes allowed on Windows. ........ r60319 | georg.brandl | 2008-01-26 14:41:21 +0100 (Sat, 26 Jan 2008) | 2 lines Fix markup again. ........ r60320 | andrew.kuchling | 2008-01-26 14:50:51 +0100 (Sat, 26 Jan 2008) | 1 line Add some items ........ r60321 | georg.brandl | 2008-01-26 15:02:38 +0100 (Sat, 26 Jan 2008) | 2 lines Clarify "b" mode under Unix. ........ r60322 | georg.brandl | 2008-01-26 15:03:47 +0100 (Sat, 26 Jan 2008) | 3 lines #1940: make it possible to use curses.filter() before curses.initscr() as the documentation says. ........ r60324 | georg.brandl | 2008-01-26 15:14:20 +0100 (Sat, 26 Jan 2008) | 3 lines #1473257: add generator.gi_code attribute that refers to the original code object backing the generator. Patch by Collin Winter. ........ r60325 | georg.brandl | 2008-01-26 15:19:22 +0100 (Sat, 26 Jan 2008) | 2 lines Move C API entries to the corresponding section. ........ r60326 | christian.heimes | 2008-01-26 17:43:35 +0100 (Sat, 26 Jan 2008) | 1 line Unit test fix from Giampaolo Rodola, #1938 ........ r60327 | gregory.p.smith | 2008-01-26 19:51:05 +0100 (Sat, 26 Jan 2008) | 2 lines Update docs for new callpack params added in r60188 ........ r60329 | neal.norwitz | 2008-01-26 21:24:36 +0100 (Sat, 26 Jan 2008) | 3 lines Cleanup the code a bit. test_rfind is failing on PPC and PPC64 buildbots, this might fix the problem. ........ r60330 | neal.norwitz | 2008-01-26 22:02:45 +0100 (Sat, 26 Jan 2008) | 1 line Always try to remove the test file even if close raises an exception ........ r60331 | neal.norwitz | 2008-01-26 22:21:59 +0100 (Sat, 26 Jan 2008) | 3 lines Reduce the race condition by signalling when the server is ready and not trying to connect before. ........ r60334 | neal.norwitz | 2008-01-27 00:13:46 +0100 (Sun, 27 Jan 2008) | 5 lines On some systems (e.g., Ubuntu on hppa) the flush() doesn't cause the exception, but the close() does. Will backport. ........ r60335 | neal.norwitz | 2008-01-27 00:14:17 +0100 (Sun, 27 Jan 2008) | 2 lines Consistently use tempfile.tempdir for the db_home directory. ........ r60338 | neal.norwitz | 2008-01-27 02:44:05 +0100 (Sun, 27 Jan 2008) | 4 lines Eliminate the sleeps that assume the server will start in .5 seconds. This should make the test less flaky. It also speeds up the test by about 75% on my box (20+ seconds -> ~4 seconds). ........ r60342 | neal.norwitz | 2008-01-27 06:02:34 +0100 (Sun, 27 Jan 2008) | 6 lines Try to prevent this test from being flaky. We might need a sleep in here which isn't as bad as it sounds. The close() *should* raise an exception, so if it didn't we should give more time to sync and really raise it. Will backport. ........ r60344 | jeffrey.yasskin | 2008-01-27 06:40:35 +0100 (Sun, 27 Jan 2008) | 3 lines Make rational.gcd() public and allow Rational to take decimal strings, per Raymond's advice. ........ r60345 | neal.norwitz | 2008-01-27 08:36:03 +0100 (Sun, 27 Jan 2008) | 3 lines Mostly reformat. Also set an error and return NULL if neither MS_WINDOWS nor UNIX is defined. This may have caused problems on cygwin. ........ r60346 | neal.norwitz | 2008-01-27 08:37:38 +0100 (Sun, 27 Jan 2008) | 3 lines Use int for the sign rather than a char. char can be signed or unsigned. It's system dependent. This might fix the problem with test_rfind failing. ........ r60347 | neal.norwitz | 2008-01-27 08:41:33 +0100 (Sun, 27 Jan 2008) | 1 line Add stdarg include for va_list to get this to compile on cygwin ........ r60348 | raymond.hettinger | 2008-01-27 11:13:57 +0100 (Sun, 27 Jan 2008) | 1 line Docstring nit ........ r60349 | raymond.hettinger | 2008-01-27 11:47:55 +0100 (Sun, 27 Jan 2008) | 1 line Removed an unnecessary and confusing paragraph from the namedtuple docs. ........
259 lines
8.1 KiB
Python
259 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 = "127.0.0.1"
|
|
PORT = 54322
|
|
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
|
|
|
|
def run(self):
|
|
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
|
global PORT
|
|
PORT = test_support.bind_port(sock, HOST, PORT)
|
|
sock.listen(1)
|
|
self.event.set()
|
|
conn, client = 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()
|
|
sock.close()
|
|
|
|
class echo_client(asynchat.async_chat):
|
|
|
|
def __init__(self, terminator):
|
|
asynchat.async_chat.__init__(self)
|
|
self.contents = []
|
|
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
self.connect((HOST, 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)
|
|
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)
|
|
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)
|
|
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')
|
|
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')
|
|
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')
|
|
c.push(b"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')
|
|
c.push(b"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)
|