summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2009-09-27 21:10:38 (GMT)
committerKristján Valur Jónsson <kristjan@ccpgames.com>2009-09-27 21:10:38 (GMT)
commit847ec75d3eed49b898ad69a55edaf65f3c8a7a4a (patch)
treef4aa1996d5c2601ce0104307fceb2de4fde188a6 /Lib
parent7d3d209b54bd517160c589c9c797e03571a03b3a (diff)
downloadcpython-847ec75d3eed49b898ad69a55edaf65f3c8a7a4a.zip
cpython-847ec75d3eed49b898ad69a55edaf65f3c8a7a4a.tar.gz
cpython-847ec75d3eed49b898ad69a55edaf65f3c8a7a4a.tar.bz2
http://bugs.python.org/issue6971
Porting revision 75054 from trunk
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socket.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 8313006..1facf0a 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -553,6 +553,10 @@ class GeneralModuleTests(unittest.TestCase):
self.assertTrue(hasattr(socket, 'SIO_RCVALL'))
self.assertTrue(hasattr(socket, 'RCVALL_ON'))
self.assertTrue(hasattr(socket, 'RCVALL_OFF'))
+ self.assertTrue(hasattr(socket, 'SIO_KEEPALIVE_VALS'))
+ s = socket.socket()
+ self.assertRaises(ValueError, s.ioctl, -1, None)
+ s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100))
class BasicTCPTest(SocketConnectedTest):