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

@@ -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):

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

greentest/test_socket_green.py

@@ -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')

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:

greentest/test_socketserver_green.py

@@ -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')

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

greentest/test_thread_green.py

@@ -1,4 +0,0 @@
-from eventlet.green import thread
-from eventlet.green import time
-
-execfile('test_thread.py')

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.

greentest/test_threading_green.py

@@ -1,5 +0,0 @@
-from eventlet.green import threading
-from eventlet.green import thread
-from eventlet.green import time
-
-execfile('test_threading.py')

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()"""
 

greentest/test_timeout_green.py

@@ -1,4 +0,0 @@
-from eventlet.green import time
-from eventlet.green import socket
-
-execfile('test_timeout.py')

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

greentest/test_urllib2_green.py

@@ -1,4 +0,0 @@
-import sys
-from eventlet.green import socket
-
-execfile('test_urllib2.py')

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

greentest/test_urllib2_localnet_green.py

@@ -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')