Fixed fragile test that used to rely on exc_info being incidentally replaced with something innocuous by an exception in the hub.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
"""This test checks that socket instances (not GreenSockets but underlying sockets)
|
"""This test checks that socket instances (not GreenSockets but underlying sockets)
|
||||||
are not leaked by the hub.
|
are not leaked by the hub.
|
||||||
"""
|
"""
|
||||||
#import sys
|
import sys
|
||||||
import unittest
|
import unittest
|
||||||
from pprint import pformat
|
from pprint import pformat
|
||||||
from eventlet.green import socket
|
from eventlet.green import socket
|
||||||
@@ -61,6 +61,7 @@ def run_interaction(run_client):
|
|||||||
|
|
||||||
def run_and_check(run_client):
|
def run_and_check(run_client):
|
||||||
w = run_interaction(run_client=run_client)
|
w = run_interaction(run_client=run_client)
|
||||||
|
sys.exc_clear()
|
||||||
if w():
|
if w():
|
||||||
print pformat(gc.get_referrers(w()))
|
print pformat(gc.get_referrers(w()))
|
||||||
for x in gc.get_referrers(w()):
|
for x in gc.get_referrers(w()):
|
||||||
@@ -69,13 +70,12 @@ def run_and_check(run_client):
|
|||||||
print '-', pformat(y)
|
print '-', pformat(y)
|
||||||
raise AssertionError('server should be dead by now')
|
raise AssertionError('server should be dead by now')
|
||||||
|
|
||||||
class test(unittest.TestCase):
|
|
||||||
|
|
||||||
def test_clean_exit(self):
|
def test_clean_exit():
|
||||||
run_and_check(True)
|
run_and_check(True)
|
||||||
run_and_check(True)
|
run_and_check(True)
|
||||||
|
|
||||||
def test_timeout_exit(self):
|
def test_timeout_exit():
|
||||||
run_and_check(False)
|
run_and_check(False)
|
||||||
run_and_check(False)
|
run_and_check(False)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user