[pypy-svn] r46785 - in pypy/dist/pypy/rlib: . test

arigo at codespeak.net arigo at codespeak.net
Fri Sep 21 12:26:28 CEST 2007


Author: arigo
Date: Fri Sep 21 12:26:27 2007
New Revision: 46785

Modified:
   pypy/dist/pypy/rlib/_rsocket_rffi.py
   pypy/dist/pypy/rlib/test/test_rsocket_rffi.py
Log:
Test and fix.


Modified: pypy/dist/pypy/rlib/_rsocket_rffi.py
==============================================================================
--- pypy/dist/pypy/rlib/_rsocket_rffi.py	(original)
+++ pypy/dist/pypy/rlib/_rsocket_rffi.py	Fri Sep 21 12:26:27 2007
@@ -452,7 +452,7 @@
                        ssize_t)
 sendto = external('sendto', [socketfd_type, rffi.VOIDP, size_t, rffi.INT,
                                     sockaddr_ptr, socklen_t], ssize_t)
-shutdown = external('shutdown', [socketfd_type, rffi.INT], rffi.INT)
+socketshutdown = external('shutdown', [socketfd_type, rffi.INT], rffi.INT)
 gethostname = external('gethostname', [rffi.CCHARP, rffi.INT], rffi.INT)
 gethostbyname = external('gethostbyname', [rffi.CCHARP],
                                 lltype.Ptr(cConfig.hostent))
@@ -472,8 +472,6 @@
     ioctlsocket = socketdll.ioctlsocket
     ioctlsocket.argtypes = [socketfd_type, rffi.LONG, POINTER(c_ulong)]
     ioctlsocket.restype = c_int
-    
-shutdown = external('shutdown', [rffi.INT, rffi.INT], rffi.INT)
 
 if _POSIX:
     poll = external('poll', [lltype.Ptr(pollfd), nfds_t, rffi.INT], rffi.INT)

Modified: pypy/dist/pypy/rlib/test/test_rsocket_rffi.py
==============================================================================
--- pypy/dist/pypy/rlib/test/test_rsocket_rffi.py	(original)
+++ pypy/dist/pypy/rlib/test/test_rsocket_rffi.py	Fri Sep 21 12:26:27 2007
@@ -136,6 +136,7 @@
         buf += data
     assert buf == 'x'*50000
     print 'data received ok'
+    s1.shutdown(SHUT_RDWR)
     s1.close()
     s2.close()
 



More information about the Pypy-commit mailing list