Fix some deprecation warnings

1 files changed, 15 insertions, 18 deletions

diff --git a/tests/api_test.py b/tests/api_test.py
index ceb747f..edfe624 100644
--- a/tests/api_test.py
+++ b/tests/api_test.py
@@ -2,11 +2,12 @@ import os
 import os.path
 import socket
 from unittest import TestCase, main
+import warnings
 
+warnings.simplefilter('ignore', DeprecationWarning)
 from eventlet import api
-from eventlet import greenio
-from eventlet import util
-from eventlet import hubs
+warnings.simplefilter('default', DeprecationWarning)
+from eventlet import greenio, util, hubs, greenthread, spawn
 
 def check_hub():
     # Clear through the descriptor queue
@@ -29,7 +30,7 @@ class TestApi(TestCase):
     private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key')
 
     def test_tcp_listener(self):
-        socket = api.tcp_listener(('0.0.0.0', 0))
+        socket = greenio.listen(('0.0.0.0', 0))
         assert socket.getsockname()[0] == '0.0.0.0'
         socket.close()
 
@@ -46,10 +47,10 @@ class TestApi(TestCase):
             finally:
                 listenfd.close()
 
-        server = api.tcp_listener(('0.0.0.0', 0))
+        server = greenio.listen(('0.0.0.0', 0))
         api.spawn(accept_once, server)
 
-        client = api.connect_tcp(('127.0.0.1', server.getsockname()[1]))
+        client = greenio.connect(('127.0.0.1', server.getsockname()[1]))
         fd = client.makefile()
         client.close()
         assert fd.readline() == 'hello\n'
@@ -75,7 +76,7 @@ class TestApi(TestCase):
                                   self.private_key_file)
         api.spawn(accept_once, server)
 
-        raw_client = api.connect_tcp(('127.0.0.1', server.getsockname()[1]))
+        raw_client = greenio.connect(('127.0.0.1', server.getsockname()[1]))
         client = util.wrap_ssl(raw_client)
         fd = socket._fileobject(client, 'rb', 8192)
 
@@ -92,16 +93,15 @@ class TestApi(TestCase):
 
     def test_001_trampoline_timeout(self):
         from eventlet import coros
-        server_sock = api.tcp_listener(('127.0.0.1', 0))
+        server_sock = greenio.listen(('127.0.0.1', 0))
         bound_port = server_sock.getsockname()[1]
         def server(sock):
             client, addr = sock.accept()
             api.sleep(0.1)
-        server_evt = coros.execute(server, server_sock)
+        server_evt = spawn(server, server_sock)
         api.sleep(0)
         try:
-            desc = greenio.GreenSocket(util.tcp_socket())
-            desc.connect(('127.0.0.1', bound_port))
+            desc = greenio.connect(('127.0.0.1', bound_port))
             api.trampoline(desc, read=True, write=False, timeout=0.001)
         except api.TimeoutError:
             pass # test passed
@@ -112,7 +112,7 @@ class TestApi(TestCase):
         check_hub()
 
     def test_timeout_cancel(self):
-        server = api.tcp_listener(('0.0.0.0', 0))
+        server = greenio.listen(('0.0.0.0', 0))
         bound_port = server.getsockname()[1]
 
         done = [False]
@@ -122,20 +122,17 @@ class TestApi(TestCase):
                 conn.close()
 
         def go():
-            client = util.tcp_socket()
-
-            desc = greenio.GreenSocket(client)
-            desc.connect(('127.0.0.1', bound_port))
+            desc = greenio.connect(('127.0.0.1', bound_port))
             try:
                 api.trampoline(desc, read=True, timeout=0.1)
             except api.TimeoutError:
                 assert False, "Timed out"
 
             server.close()
-            client.close()
+            desc.close()
             done[0] = True
 
-        api.call_after(0, go)
+        greenthread.spawn_after_local(0, go)
 
         server_coro = api.spawn(client_closer, server)
         while not done[0]: