Do not hang test_socket under pypy and fix...

Do not hang test_socket under pypy and fix NetworkConnectionNoServer.test_create_connection_timeout.

greentest/2.7/test_socket.py

@@ -1177,11 +1177,15 @@ class NetworkConnectionNoServer(unittest.TestCase):
     def mocked_socket_module(self):
         """Return a socket which times out on connect"""
         old_socket = socket.socket
+        import gevent.socket
+        old_g_socket = gevent.socket.socket
         socket.socket = self.MockSocket
+        gevent.socket.socket = self.MockSocket
         try:
             yield
         finally:
             socket.socket = old_socket
+            gevent.socket.socket = old_g_socket
 
     def test_connect(self):
         port = test_support.find_unused_port()

greentest/2.7pypy/test_socket.py

@@ -706,6 +706,7 @@ class GeneralModuleTests(unittest.TestCase):
             c.close()
             s.close()
 
+    @unittest.skip("Needs fix in CFFI; hangs forever")
     def test_sendall_interrupted(self):
         self.check_sendall_interrupted(False)
 
@@ -1291,11 +1292,15 @@ class NetworkConnectionNoServer(unittest.TestCase):
     def mocked_socket_module(self):
         """Return a socket which times out on connect"""
         old_socket = socket.socket
+        import gevent.socket
+        old_g_socket = gevent.socket.socket
         socket.socket = self.MockSocket
+        gevent.socket.socket = self.MockSocket
         try:
             yield
         finally:
             socket.socket = old_socket
+            gevent.socket.socket = old_g_socket
 
     def test_connect(self):
         port = test_support.find_unused_port()