From 63bcdc56682ade48c733cfb5cb3a51f677e14efc Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 24 Dec 2008 13:20:25 +0600 Subject: [PATCH] removed test_xxx_green.py files; moved the relevant stuff to test_xxx.py directly; undone some of my changes to python standard tests --- greentest/runall.py | 7 +++---- greentest/test_socket.py | 9 +++++---- greentest/test_socket_green.py | 12 ------------ greentest/test_socketserver.py | 13 +++++++++---- greentest/test_socketserver_green.py | 8 -------- greentest/test_thread.py | 2 ++ greentest/test_thread_green.py | 4 ---- greentest/test_threading.py | 3 +++ greentest/test_threading_green.py | 5 ----- greentest/test_timeout.py | 3 +++ greentest/test_timeout_green.py | 4 ---- greentest/test_urllib2.py | 6 +++--- greentest/test_urllib2_green.py | 4 ---- greentest/test_urllib2_localnet.py | 5 +++++ greentest/test_urllib2_localnet_green.py | 7 ------- 15 files changed, 33 insertions(+), 59 deletions(-) delete mode 100644 greentest/test_socket_green.py delete mode 100644 greentest/test_socketserver_green.py delete mode 100644 greentest/test_thread_green.py delete mode 100644 greentest/test_threading_green.py delete mode 100644 greentest/test_timeout_green.py delete mode 100644 greentest/test_urllib2_green.py delete mode 100644 greentest/test_urllib2_localnet_green.py diff --git a/greentest/runall.py b/greentest/runall.py index e223676..224cf5b 100755 --- a/greentest/runall.py +++ b/greentest/runall.py @@ -18,7 +18,7 @@ PARSE_PERIOD = 10 # the following aren't in the default list unless --all option present NOT_HUBS = set(['nginx']) NOT_REACTORS = set(['wxreactor', 'glib2reactor', 'gtk2reactor']) -NOT_TESTS = set(['test_threading_green.py']) +NOT_TESTS = set(['test_threading.py']) def w(s): sys.stderr.write("%s\n" % (s, )) @@ -59,10 +59,9 @@ def enum_reactors(): def enum_tests(): tests = [] - tests += glob('test*_green.py') - tests += glob('test__*.py') + tests += glob('test_*.py') tests += glob('*_test.py') - tests = set(tests) - NOT_TESTS + tests = set(tests) - NOT_TESTS - set(['test_support.py']) return tests def cmd(program): diff --git a/greentest/test_socket.py b/greentest/test_socket.py index 3d148d0..d818e8a 100644 --- a/greentest/test_socket.py +++ b/greentest/test_socket.py @@ -1,11 +1,12 @@ -#do not run me, I don't import any socket module. -#run test_socket_green.py or test_socket_hook.py instead +#!/usr/bin/env python import unittest from greentest import test_support -from eventlet.green import thread -from eventlet.green import threading +from eventlet.green import socket +from eventlet.green import select +from eventlet.green import time +from eventlet.green import thread, threading import Queue import sys import array diff --git a/greentest/test_socket_green.py b/greentest/test_socket_green.py deleted file mode 100644 index 84aac67..0000000 --- a/greentest/test_socket_green.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -import sys -if 'twisted.internet.reactor' not in sys.modules: - # the following line makes a difference on my machine (fixes 2 failures) - from twisted.internet import pollreactor; pollreactor.install() - -from eventlet.green import socket -from eventlet.green import select -from eventlet.green import time - -execfile('test_socket.py') diff --git a/greentest/test_socketserver.py b/greentest/test_socketserver.py index fa9c79d..09e97b5 100644 --- a/greentest/test_socketserver.py +++ b/greentest/test_socketserver.py @@ -1,15 +1,22 @@ # Test suite for SocketServer.py +# converted to unittest (Denis) + from greentest import test_support from greentest.test_support import (verbose, verify, TESTFN, TestSkipped, reap_children) test_support.requires('network') +from eventlet.green.SocketServer import * +from eventlet.green import socket import errno +from eventlet.green import select +from eventlet.green import time +from eventlet.green import threading import os import unittest NREQ = 3 -DELAY = 0.1 +DELAY = 0.05 class MyMixinHandler: def handle(self): @@ -33,12 +40,10 @@ class MyMixinServer: self.server_close() raise -teststring = "hello world\r\n" +teststring = "hello world\n" def receive(sock, n, timeout=5): - #print 'select args: ', [sock], [], [], timeout r, w, x = select.select([sock], [], [], timeout) - #print 'select results: ', r, w, x if sock in r: return sock.recv(n) else: diff --git a/greentest/test_socketserver_green.py b/greentest/test_socketserver_green.py deleted file mode 100644 index d7d4f75..0000000 --- a/greentest/test_socketserver_green.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys -from eventlet.green.SocketServer import * -from eventlet.green import socket -from eventlet.green import select -from eventlet.green import time -from eventlet.green import threading - -execfile('test_socketserver.py') diff --git a/greentest/test_thread.py b/greentest/test_thread.py index 7e3739a..f70fa87 100644 --- a/greentest/test_thread.py +++ b/greentest/test_thread.py @@ -4,6 +4,8 @@ from greentest.test_support import verbose import random +from eventlet.green import thread +from eventlet.green import time mutex = thread.allocate_lock() rmutex = thread.allocate_lock() # for calls to random diff --git a/greentest/test_thread_green.py b/greentest/test_thread_green.py deleted file mode 100644 index 85397c9..0000000 --- a/greentest/test_thread_green.py +++ /dev/null @@ -1,4 +0,0 @@ -from eventlet.green import thread -from eventlet.green import time - -execfile('test_thread.py') diff --git a/greentest/test_threading.py b/greentest/test_threading.py index abe6951..93f2506 100644 --- a/greentest/test_threading.py +++ b/greentest/test_threading.py @@ -4,6 +4,9 @@ import greentest.test_support from greentest.test_support import verbose import random import sys +from eventlet.green import threading +from eventlet.green import thread +from eventlet.green import time import unittest # A trivial mutable counter. diff --git a/greentest/test_threading_green.py b/greentest/test_threading_green.py deleted file mode 100644 index d8be2a7..0000000 --- a/greentest/test_threading_green.py +++ /dev/null @@ -1,5 +0,0 @@ -from eventlet.green import threading -from eventlet.green import thread -from eventlet.green import time - -execfile('test_threading.py') diff --git a/greentest/test_timeout.py b/greentest/test_timeout.py index 5bd4a87..54a2422 100644 --- a/greentest/test_timeout.py +++ b/greentest/test_timeout.py @@ -7,6 +7,9 @@ from greentest import test_support # This requires the 'network' resource as given on the regrtest command line. skip_expected = not test_support.is_resource_enabled('network') +from eventlet.green import time +from eventlet.green import socket + class CreationTestCase(unittest.TestCase): """Test case for socket.gettimeout() and socket.settimeout()""" diff --git a/greentest/test_timeout_green.py b/greentest/test_timeout_green.py deleted file mode 100644 index 7395a91..0000000 --- a/greentest/test_timeout_green.py +++ /dev/null @@ -1,4 +0,0 @@ -from eventlet.green import time -from eventlet.green import socket - -execfile('test_timeout.py') diff --git a/greentest/test_urllib2.py b/greentest/test_urllib2.py index 7a1f923..9e0a3a4 100644 --- a/greentest/test_urllib2.py +++ b/greentest/test_urllib2.py @@ -2,10 +2,10 @@ import unittest from greentest import test_support import os +from eventlet.green import socket import StringIO - -import urllib2 -from urllib2 import Request, OpenerDirector +from eventlet.green import urllib2 +from eventlet.green.urllib2 import Request, OpenerDirector # XXX # Request diff --git a/greentest/test_urllib2_green.py b/greentest/test_urllib2_green.py deleted file mode 100644 index 1ab5d49..0000000 --- a/greentest/test_urllib2_green.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys -from eventlet.green import socket - -execfile('test_urllib2.py') diff --git a/greentest/test_urllib2_localnet.py b/greentest/test_urllib2_localnet.py index 96cb848..3d85e5d 100644 --- a/greentest/test_urllib2_localnet.py +++ b/greentest/test_urllib2_localnet.py @@ -5,6 +5,11 @@ import urlparse import unittest import hashlib from greentest import test_support +from eventlet.green import threading +from eventlet.green import socket +from eventlet.green import urllib2 +from eventlet.green import BaseHTTPServer + # Loopback http server infrastructure diff --git a/greentest/test_urllib2_localnet_green.py b/greentest/test_urllib2_localnet_green.py deleted file mode 100644 index b882b31..0000000 --- a/greentest/test_urllib2_localnet_green.py +++ /dev/null @@ -1,7 +0,0 @@ -import sys -from eventlet.green import threading -from eventlet.green import socket -from eventlet.green import urllib2 -from eventlet.green import BaseHTTPServer - -execfile('test_urllib2_localnet.py')