Skip to content

Commit d025613

Browse files
committed
fix unstable connection test wait proxy ioloop wakeup finish
1 parent 89b8d0d commit d025613

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

tests/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
import os
55
from tormysql import ConnectionPool
6-
from tornado.testing import AsyncTestCase
6+
try:
7+
from tornado.testing import AsyncTestCase
8+
except:
9+
from unittest import TestCase as AsyncTestCase
710

811
class BaseTestCase(AsyncTestCase):
912
PARAMS = dict(

tests/test_unstable_connection.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,14 @@ def on_connect(server, conn):
8282
self.PARAMS['port'] = self.pport
8383
self.PARAMS['host'] = '127.0.0.1'
8484
sevent.current().wakeup()
85+
time.sleep(0.1)
8586

8687
def _close_proxy_sessions(self):
8788
def do_close():
8889
for request in TestThroughProxy.proxys:
8990
request.conn.end()
9091
sevent.current().wakeup(do_close)
92+
time.sleep(0.1)
9193

9294
def tearDown(self):
9395
try:
@@ -96,6 +98,7 @@ def do_close():
9698
request.conn.end()
9799
self.proxy_server.close()
98100
sevent.current().wakeup(do_close)
101+
time.sleep(0.1)
99102
except:
100103
pass
101104
super(BaseTestCase, self).tearDown()
@@ -116,6 +119,7 @@ def _execute_test_connection_closing(self):
116119
raise AssertionError("Unexpected normal situation")
117120

118121
sevent.current().wakeup(self.proxy_server.close)
122+
time.sleep(0.1)
119123

120124
@gen.coroutine
121125
def _execute_test_connection_closed(self):
@@ -125,6 +129,7 @@ def _execute_test_connection_closed(self):
125129
yield conn.close()
126130

127131
sevent.current().wakeup(self.proxy_server.close)
132+
time.sleep(0.1)
128133

129134
try:
130135
yield Connection(**self.PARAMS)
@@ -148,6 +153,7 @@ def _execute_test_remote_closing(self):
148153
yield conn.do_close()
149154

150155
sevent.current().wakeup(self.proxy_server.close)
156+
time.sleep(0.1)
151157

152158
yield pool.Connection()
153159
except OperationalError:
@@ -179,6 +185,7 @@ def _execute_test_pool_closing(self):
179185
yield pool.close()
180186

181187
sevent.current().wakeup(self.proxy_server.close)
188+
time.sleep(0.1)
182189

183190
@gen_test
184191
def test(self):

0 commit comments

Comments
 (0)