From e5df2f92c4976765d82f20f31511bffac52a08dd Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 8 Jun 2009 15:44:01 +0700 Subject: [PATCH] remove a number of unused imports from tests --- greentest/coros_test.py | 2 - greentest/db_pool_test.py | 2 - greentest/greenio_test.py | 2 +- greentest/httpc_test.py | 2 - greentest/httpd_test.py | 2 - greentest/pools_test.py | 3 -- greentest/processes_test.py | 1 - greentest/test__pool.py | 1 - greentest/test__twistedutil_protocol.py | 49 +------------------------ greentest/tpool_test.py | 3 +- greentest/wsgi_test.py | 1 - 11 files changed, 3 insertions(+), 65 deletions(-) diff --git a/greentest/coros_test.py b/greentest/coros_test.py index ac2f94a..bc683cd 100644 --- a/greentest/coros_test.py +++ b/greentest/coros_test.py @@ -22,10 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ from greentest import tests -from eventlet import timer from eventlet import coros, api -import sys class TestEvent(tests.TestCase): mode = 'static' diff --git a/greentest/db_pool_test.py b/greentest/db_pool_test.py index a073c6d..1ddee51 100644 --- a/greentest/db_pool_test.py +++ b/greentest/db_pool_test.py @@ -22,8 +22,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -import os.path - from eventlet import api, coros from greentest import tests from eventlet import db_pool diff --git a/greentest/greenio_test.py b/greentest/greenio_test.py index e769008..e1b17c1 100644 --- a/greentest/greenio_test.py +++ b/greentest/greenio_test.py @@ -22,7 +22,7 @@ THE SOFTWARE. """ from greentest import tests -from eventlet import api, greenio, util +from eventlet import api import socket # TODO try and reuse unit tests from within Python itself diff --git a/greentest/httpc_test.py b/greentest/httpc_test.py index 95110e4..f8bb9aa 100644 --- a/greentest/httpc_test.py +++ b/greentest/httpc_test.py @@ -26,8 +26,6 @@ import cgi from eventlet import api from eventlet import httpc -from eventlet import processes -from eventlet import util from eventlet import wsgi import time diff --git a/greentest/httpd_test.py b/greentest/httpd_test.py index e6af7c5..e94935a 100644 --- a/greentest/httpd_test.py +++ b/greentest/httpd_test.py @@ -33,8 +33,6 @@ try: except ImportError: from StringIO import StringIO -from eventlet import greenio - util.wrap_socket_with_coroutine_socket() diff --git a/greentest/pools_test.py b/greentest/pools_test.py index 3fffdf0..65639fd 100644 --- a/greentest/pools_test.py +++ b/greentest/pools_test.py @@ -22,14 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -import sys - from eventlet import api from eventlet import channel from eventlet import coros from eventlet import pools from greentest import tests -from eventlet import timer class IntPool(pools.Pool): def create(self): diff --git a/greentest/processes_test.py b/greentest/processes_test.py index b5eee6a..95dc154 100644 --- a/greentest/processes_test.py +++ b/greentest/processes_test.py @@ -24,7 +24,6 @@ THE SOFTWARE. import sys from greentest import tests -from eventlet import api from eventlet import processes class TestEchoPool(tests.TestCase): diff --git a/greentest/test__pool.py b/greentest/test__pool.py index b9be4ae..38354c7 100644 --- a/greentest/test__pool.py +++ b/greentest/test__pool.py @@ -1,4 +1,3 @@ -import sys from eventlet import pool, coros, api from greentest import LimitedTestCase from unittest import main diff --git a/greentest/test__twistedutil_protocol.py b/greentest/test__twistedutil_protocol.py index dad7441..7a63d09 100644 --- a/greentest/test__twistedutil_protocol.py +++ b/greentest/test__twistedutil_protocol.py @@ -20,7 +20,7 @@ # THE SOFTWARE. from twisted.internet import reactor -from greentest import exit_unless_twisted, LimitedTestCase +from greentest import exit_unless_twisted exit_unless_twisted() import unittest @@ -188,53 +188,6 @@ class TestGreenTransport_bufsize1(TestGreenTransport): # self.assertEqual('', self.conn.recv()) # -# class TestHalfClose_TCP(LimitedTestCase): -# -# def _test_server(self, conn): -# conn.write('hello') -# conn.loseWriteConnection() -# self.assertRaises(pr.ConnectionDone, conn.write, 'hey') -# data = conn.read() -# self.assertEqual('bye', data) -# conn.loseConnection() -# self.assertRaises(ConnectionDone, conn._wait) -# self.check.append('server') -# -# def setUp(self): -# LimitedTestCase.setUp(self) -# self.factory = pr.SpawnFactory(self._test_server) -# self.port = reactor.listenTCP(0, self.factory) -# self.conn = pr.GreenClientCreator(reactor).connectTCP('localhost', self.port.getHost().port) -# self.port.stopListening() -# self.check = [] -# -# def test(self): -# conn = self.conn -# data = conn.read() -# self.assertEqual('hello', data) -# conn.write('bye') -# conn.loseWriteConnection() -# self.assertRaises(pr.ConnectionDone, conn.write, 'hoy') -# self.factory.waitall() -# self.assertRaises(ConnectionDone, conn._wait) -# assert self.check == ['server'] -# -# class TestHalfClose_TLS(TestHalfClose_TCP): -# -# def setUp(self): -# LimitedTestCase.setUp(self) -# from gnutls.crypto import X509PrivateKey, X509Certificate -# from gnutls.interfaces.twisted import X509Credentials -# cert = X509Certificate(open('gnutls_valid.crt').read()) -# key = X509PrivateKey(open('gnutls_valid.key').read()) -# server_credentials = X509Credentials(cert, key) -# self.factory = pr.SpawnFactory(self._test_server) -# self.port = reactor.listenTLS(0, self.factory, server_credentials) -# self.conn = pr.GreenClientCreator(reactor).connectTLS('localhost', self.port.getHost().port, X509Credentials()) -# self.port.stopListening() -# self.check = [] -# - if socket is not None: class TestUnbufferedTransport_socketserver(TestUnbufferedTransport): diff --git a/greentest/tpool_test.py b/greentest/tpool_test.py index a7641a7..6fdc795 100644 --- a/greentest/tpool_test.py +++ b/greentest/tpool_test.py @@ -17,11 +17,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -import os, socket, time, threading +import time from eventlet import coros, api, tpool from greentest import tests -from eventlet.tpool import erpc from sys import stdout import random diff --git a/greentest/wsgi_test.py b/greentest/wsgi_test.py index f06ebb7..58187ff 100644 --- a/greentest/wsgi_test.py +++ b/greentest/wsgi_test.py @@ -28,7 +28,6 @@ import os from eventlet import api from eventlet import wsgi from eventlet import processes -from eventlet import util try: from cStringIO import StringIO