diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test___all__.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_socketserver.py | 58 | ||||
| -rwxr-xr-x | Lib/test/test_wsgiref.py | 2 |
5 files changed, 32 insertions, 33 deletions
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index 846a2f60d2..ec58c14af1 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -42,7 +42,7 @@ class AllTest(unittest.TestCase): self.check_all("MimeWriter") self.check_all("queue") self.check_all("SimpleHTTPServer") - self.check_all("socketserver") + self.check_all("SocketServer") self.check_all("StringIO") self.check_all("UserString") self.check_all("aifc") diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 97e1af38a7..b937411c03 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -33,7 +33,7 @@ import os import re import select import socket -from socketserver import ThreadingTCPServer, StreamRequestHandler +from SocketServer import ThreadingTCPServer, StreamRequestHandler import string import struct import sys diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index b12d14d645..5a9421f1e5 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -216,7 +216,6 @@ class TestStdlibRemovals(unittest.TestCase): class TestStdlibRenames(unittest.TestCase): renames = {'Queue': 'queue', - 'SocketServer': 'socketserver', 'ConfigParser': 'configparser', } diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 4e26e7b4d9..8595e5a245 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -1,5 +1,5 @@ """ -Test suite for socketserver. +Test suite for SocketServer.py. """ import contextlib @@ -13,7 +13,7 @@ import tempfile import threading import time import unittest -import socketserver +import SocketServer import test.test_support from test.test_support import reap_children, verbose, TestSkipped @@ -40,12 +40,12 @@ def receive(sock, n, timeout=20): raise RuntimeError, "timed out on %r" % (sock,) if HAVE_UNIX_SOCKETS: - class ForkingUnixStreamServer(socketserver.ForkingMixIn, - socketserver.UnixStreamServer): + class ForkingUnixStreamServer(SocketServer.ForkingMixIn, + SocketServer.UnixStreamServer): pass - class ForkingUnixDatagramServer(socketserver.ForkingMixIn, - socketserver.UnixDatagramServer): + class ForkingUnixDatagramServer(SocketServer.ForkingMixIn, + SocketServer.UnixDatagramServer): pass @@ -172,55 +172,55 @@ class SocketServerTest(unittest.TestCase): s.close() def test_TCPServer(self): - self.run_server(socketserver.TCPServer, - socketserver.StreamRequestHandler, + self.run_server(SocketServer.TCPServer, + SocketServer.StreamRequestHandler, self.stream_examine) def test_ThreadingTCPServer(self): - self.run_server(socketserver.ThreadingTCPServer, - socketserver.StreamRequestHandler, + self.run_server(SocketServer.ThreadingTCPServer, + SocketServer.StreamRequestHandler, self.stream_examine) if HAVE_FORKING: def test_ForkingTCPServer(self): with simple_subprocess(self): - self.run_server(socketserver.ForkingTCPServer, - socketserver.StreamRequestHandler, + self.run_server(SocketServer.ForkingTCPServer, + SocketServer.StreamRequestHandler, self.stream_examine) if HAVE_UNIX_SOCKETS: def test_UnixStreamServer(self): - self.run_server(socketserver.UnixStreamServer, - socketserver.StreamRequestHandler, + self.run_server(SocketServer.UnixStreamServer, + SocketServer.StreamRequestHandler, self.stream_examine) def test_ThreadingUnixStreamServer(self): - self.run_server(socketserver.ThreadingUnixStreamServer, - socketserver.StreamRequestHandler, + self.run_server(SocketServer.ThreadingUnixStreamServer, + SocketServer.StreamRequestHandler, self.stream_examine) if HAVE_FORKING: def test_ForkingUnixStreamServer(self): with simple_subprocess(self): self.run_server(ForkingUnixStreamServer, - socketserver.StreamRequestHandler, + SocketServer.StreamRequestHandler, self.stream_examine) def test_UDPServer(self): - self.run_server(socketserver.UDPServer, - socketserver.DatagramRequestHandler, + self.run_server(SocketServer.UDPServer, + SocketServer.DatagramRequestHandler, self.dgram_examine) def test_ThreadingUDPServer(self): - self.run_server(socketserver.ThreadingUDPServer, - socketserver.DatagramRequestHandler, + self.run_server(SocketServer.ThreadingUDPServer, + SocketServer.DatagramRequestHandler, self.dgram_examine) if HAVE_FORKING: def test_ForkingUDPServer(self): with simple_subprocess(self): - self.run_server(socketserver.ForkingUDPServer, - socketserver.DatagramRequestHandler, + self.run_server(SocketServer.ForkingUDPServer, + SocketServer.DatagramRequestHandler, self.dgram_examine) # Alas, on Linux (at least) recvfrom() doesn't return a meaningful @@ -228,19 +228,19 @@ class SocketServerTest(unittest.TestCase): # if HAVE_UNIX_SOCKETS: # def test_UnixDatagramServer(self): - # self.run_server(socketserver.UnixDatagramServer, - # socketserver.DatagramRequestHandler, + # self.run_server(SocketServer.UnixDatagramServer, + # SocketServer.DatagramRequestHandler, # self.dgram_examine) # # def test_ThreadingUnixDatagramServer(self): - # self.run_server(socketserver.ThreadingUnixDatagramServer, - # socketserver.DatagramRequestHandler, + # self.run_server(SocketServer.ThreadingUnixDatagramServer, + # SocketServer.DatagramRequestHandler, # self.dgram_examine) # # if HAVE_FORKING: # def test_ForkingUnixDatagramServer(self): - # self.run_server(socketserver.ForkingUnixDatagramServer, - # socketserver.DatagramRequestHandler, + # self.run_server(SocketServer.ForkingUnixDatagramServer, + # SocketServer.DatagramRequestHandler, # self.dgram_examine) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py index e30990ef31..b6d994b03d 100755 --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -8,7 +8,7 @@ from wsgiref.validate import validator from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app from wsgiref.simple_server import make_server from StringIO import StringIO -from socketserver import BaseServer +from SocketServer import BaseServer import re, sys from test import test_support |