moved function eventlet.support.capture_stderr to tests

5 files changed, 23 insertions, 28 deletions

diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py
index 0970f31..43bac91 100644
--- a/eventlet/support/__init__.py
+++ b/eventlet/support/__init__.py
@@ -2,9 +2,8 @@ import inspect
 import functools
 import sys
 import warnings
-import contextlib
 
-from eventlet.support import greenlets, six
+from eventlet.support import greenlets
 
 
 _MISSING = object()
@@ -50,18 +49,6 @@ else:
 PY33 = sys.version_info[:2] == (3, 3)
 
 
-@contextlib.contextmanager
-def capture_stderr():
-    stream = six.StringIO()
-    original = sys.stderr
-    try:
-        sys.stderr = stream
-        yield stream
-    finally:
-        sys.stderr = original
-        stream.seek(0)
-
-
 def wrap_deprecated(old, new):
     def _resolve(s):
         return 'eventlet.'+s if '.' not in s else s
diff --git a/tests/__init__.py b/tests/__init__.py
index d2a2c7f..3608b63 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -24,6 +24,7 @@ from nose.plugins.skip import SkipTest
 
 import eventlet
 from eventlet import tpool
+from eventlet.support import six
 
 
 # convenience for importers
@@ -379,6 +380,18 @@ def check_is_timeout(obj):
     assert obj.is_timeout, 'type={0} str={1} .is_timeout={2}'.format(type(obj), str(obj), value_text)
 
 
+@contextlib.contextmanager
+def capture_stderr():
+    stream = six.StringIO()
+    original = sys.stderr
+    try:
+        sys.stderr = stream
+        yield stream
+    finally:
+        sys.stderr = original
+        stream.seek(0)
+
+
 certificate_file = os.path.join(os.path.dirname(__file__), 'test_server.crt')
 private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key')
 
diff --git a/tests/debug_test.py b/tests/debug_test.py
index 8710dc0..25c6efa 100644
--- a/tests/debug_test.py
+++ b/tests/debug_test.py
@@ -1,13 +1,12 @@
 import sys
-from unittest import TestCase
 
 from eventlet import debug
-from eventlet.support import capture_stderr, six
-from tests import LimitedTestCase, main
+from eventlet.support import six
+import tests
 import eventlet
 
 
-class TestSpew(TestCase):
+class TestSpew(tests.LimitedTestCase):
     def setUp(self):
         self.orig_trace = sys.settrace
         sys.settrace = self._settrace
@@ -84,7 +83,7 @@ class TestSpew(TestCase):
         assert output == ""
 
 
-class TestDebug(LimitedTestCase):
+class TestDebug(tests.LimitedTestCase):
     def test_everything(self):
         debug.hub_exceptions(True)
         debug.hub_exceptions(False)
@@ -107,7 +106,7 @@ class TestDebug(LimitedTestCase):
             s.recv(1)
             {}[1]  # keyerror
 
-        with capture_stderr() as fake:
+        with tests.capture_stderr() as fake:
             gt = eventlet.spawn(hurl, client_2)
             eventlet.sleep(0)
             client.send(b' ')
@@ -119,6 +118,3 @@ class TestDebug(LimitedTestCase):
         debug.hub_exceptions(False)
         # look for the KeyError exception in the traceback
         assert 'KeyError: 1' in fake.getvalue(), "Traceback not in:\n" + fake.getvalue()
-
-if __name__ == "__main__":
-    main()
diff --git a/tests/greenio_test.py b/tests/greenio_test.py
index 38ef191..dae1a66 100644
--- a/tests/greenio_test.py
+++ b/tests/greenio_test.py
@@ -1,6 +1,5 @@
 import array
 import errno
-import eventlet
 import fcntl
 import gc
 from io import DEFAULT_BUFFER_SIZE
@@ -16,7 +15,7 @@ import eventlet
 from eventlet import event, greenio, debug
 from eventlet.hubs import get_hub
 from eventlet.green import select, socket, time, ssl
-from eventlet.support import capture_stderr, get_errno, six
+from eventlet.support import get_errno, six
 import tests
 import tests.mock as mock
 
@@ -935,7 +934,7 @@ def test_socket_del_fails_gracefully_when_not_fully_initialized():
         def __init__(self):
             pass
 
-    with capture_stderr() as err:
+    with tests.capture_stderr() as err:
         SocketSubclass()
 
     assert err.getvalue() == ''
diff --git a/tests/wsgi_test.py b/tests/wsgi_test.py
index d9bc793..48da085 100644
--- a/tests/wsgi_test.py
+++ b/tests/wsgi_test.py
@@ -19,7 +19,7 @@ from eventlet import tpool
 from eventlet import wsgi
 from eventlet.green import socket as greensocket
 from eventlet.green import ssl
-from eventlet.support import bytes_to_str, capture_stderr, six
+from eventlet.support import bytes_to_str, six
 import tests
 
 
@@ -982,7 +982,7 @@ class TestHttpd(_TestBase):
         listener = greensocket.socket()
         listener.bind(('localhost', 0))
         # NOT calling listen, to trigger the error
-        with capture_stderr() as log:
+        with tests.capture_stderr() as log:
             self.spawn_server(sock=listener)
             eventlet.sleep(0)  # need to enter server loop
             try: