mirror of
https://github.com/python/cpython.git
synced 2025-07-24 19:54:21 +00:00
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
This commit is contained in:
parent
9ada3d6e29
commit
49fd7fa443
640 changed files with 52240 additions and 18408 deletions
|
@ -1,5 +1,6 @@
|
|||
# Test just the SSL support in the socket module, in a moderately bogus way.
|
||||
|
||||
import sys
|
||||
from test import test_support
|
||||
import socket
|
||||
|
||||
|
@ -13,6 +14,9 @@ def test_basic():
|
|||
|
||||
import urllib
|
||||
|
||||
if test_support.verbose:
|
||||
print "test_basic ..."
|
||||
|
||||
socket.RAND_status()
|
||||
try:
|
||||
socket.RAND_egd(1)
|
||||
|
@ -26,7 +30,41 @@ def test_basic():
|
|||
buf = f.read()
|
||||
f.close()
|
||||
|
||||
def test_timeout():
|
||||
test_support.requires('network')
|
||||
|
||||
if test_support.verbose:
|
||||
print "test_timeout ..."
|
||||
|
||||
# A service which issues a welcome banner (without need to write
|
||||
# anything).
|
||||
# XXX ("gmail.org", 995) has been unreliable so far, from time to time
|
||||
# XXX non-responsive for hours on end (& across all buildbot slaves,
|
||||
# XXX so that's not just a local thing).
|
||||
ADDR = "gmail.org", 995
|
||||
|
||||
s = socket.socket()
|
||||
s.settimeout(30.0)
|
||||
try:
|
||||
s.connect(ADDR)
|
||||
except socket.timeout:
|
||||
print >> sys.stderr, """\
|
||||
WARNING: an attempt to connect to %r timed out, in
|
||||
test_timeout. That may be legitimate, but is not the outcome we hoped
|
||||
for. If this message is seen often, test_timeout should be changed to
|
||||
use a more reliable address.""" % (ADDR,)
|
||||
return
|
||||
|
||||
ss = socket.ssl(s)
|
||||
# Read part of return welcome banner twice.
|
||||
ss.read(1)
|
||||
ss.read(1)
|
||||
s.close()
|
||||
|
||||
def test_rude_shutdown():
|
||||
if test_support.verbose:
|
||||
print "test_rude_shutdown ..."
|
||||
|
||||
try:
|
||||
import threading
|
||||
except ImportError:
|
||||
|
@ -74,6 +112,7 @@ def test_main():
|
|||
raise test_support.TestSkipped("socket module has no ssl support")
|
||||
test_rude_shutdown()
|
||||
test_basic()
|
||||
test_timeout()
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue