summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-03-31 18:01:16 +0000
committerGeorg Brandl <georg@python.org>2006-03-31 18:01:16 +0000
commit43f08a85e4b86acf6e4313a51cec4df0cc586da7 (patch)
treef1e9812632d468fa2340e1db157b70926117be42 /Lib
parentdd2245f2309da358b4c0b56d6a3a411888052f26 (diff)
downloadcpython-git-43f08a85e4b86acf6e4313a51cec4df0cc586da7.tar.gz
Patch #1380952: fix SSL objects timing out on consecutive read()s
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socket_ssl.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index 98680b9236..91a821295c 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -26,6 +26,19 @@ def test_basic():
buf = f.read()
f.close()
+def test_timeout():
+ test_support.requires('network')
+
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.settimeout(30.0)
+ # connect to service which issues an welcome banner (without need to write anything)
+ s.connect(("gmail.org", 995))
+ ss = socket.ssl(s)
+ # read part of return welcome banner twice,# read part of return welcome banner twice
+ ss.read(1)
+ ss.read(1)
+ s.close()
+
def test_rude_shutdown():
try:
import threading
@@ -74,6 +87,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()