Revert 156742 - Launch pywebsocket via net::TestServer

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a simple HTTP/FTP/SYNC/TCP/UDP/ server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
 the originating process over a pipe. The originating process can specify an
 explicit port if necessary.
 It can use https if you specify the flag --https=CERT where CERT is the path
 to a pem file containing the certificate and private key that should be used.
 """
 
 import asyncore
 import base64
 import BaseHTTPServer
 import cgi
 import errno
 import httplib
-import logging
 import minica
 import optparse
 import os
 import random
 import re
 import select
 import socket
 import SocketServer
 import struct
 import sys
 import threading
 import time
 import urllib
 import urlparse
 import warnings
 import zlib
 
 # Ignore deprecation warnings, they make our output more cluttered.
 warnings.filterwarnings("ignore", category=DeprecationWarning)
 
 import echo_message
-from mod_pywebsocket.standalone import WebSocketServer
 import pyftpdlib.ftpserver
 import tlslite
 import tlslite.api
 
 try:
   import hashlib
   _new_md5 = hashlib.md5
 except ImportError:
   import md5
   _new_md5 = md5.new
 
 try:
   import json
 except ImportError:
   import simplejson as json
 
 if sys.platform == 'win32':
   import msvcrt
 
 SERVER_HTTP = 0
 SERVER_FTP = 1
 SERVER_SYNC = 2
 SERVER_TCP_ECHO = 3
 SERVER_UDP_ECHO = 4
 SERVER_BASIC_AUTH_PROXY = 5
-SERVER_WEBSOCKET = 6
-
-# Default request queue size for WebSocketServer.
-_DEFAULT_REQUEST_QUEUE_SIZE = 128
 
 # Using debug() seems to cause hangs on XP: see http://crbug.com/64515 .
 debug_output = sys.stderr
 def debug(str):
   debug_output.write(str + "\n")
   debug_output.flush()
 
-class WebSocketOptions:
-  """Holds options for WebSocketServer."""
-
-  def __init__(self, host, port, data_dir):
-    self.request_queue_size = _DEFAULT_REQUEST_QUEUE_SIZE
-    self.server_host = host
-    self.port = port
-    self.websock_handlers = data_dir
-    self.scan_dir = None
-    self.allow_handlers_outside_root_dir = False
-    self.websock_handlers_map_file = None
-    self.cgi_directories = []
-    self.is_executable_method = None
-    self.allow_draft75 = False
-    self.strict = True
-
-    # TODO(toyoshim): Support SSL and authenticates (http://crbug.com/137639)
-    self.use_tls = False
-    self.private_key = None
-    self.certificate = None
-    self.tls_client_ca = None
-    self.use_basic_auth = False
-
 class RecordingSSLSessionCache(object):
   """RecordingSSLSessionCache acts as a TLS session cache and maintains a log of
   lookups and inserts in order to test session cache behaviours."""
 
   def __init__(self):
     self.log = []
 
   def __getitem__(self, sessionID):
     self.log.append(('lookup', sessionID))
     raise KeyError()
@@ skipping 2134 matching lines @@
       server = HTTPServer((host, port), TestPageHandler)
       print 'HTTP server started on %s:%d...' % (host, server.server_port)
 
     server.data_dir = MakeDataDir()
     server.file_root_url = options.file_root_url
     server_data['port'] = server.server_port
     server._device_management_handler = None
     server.policy_keys = options.policy_keys
     server.policy_user = options.policy_user
     server.gdata_auth_token = options.auth_token
-  elif options.server_type == SERVER_WEBSOCKET:
-    # Launch pywebsocket via WebSocketServer.
-    logger = logging.getLogger()
-    logger.addHandler(logging.StreamHandler())
-    # TODO(toyoshim): Remove following os.chdir. Currently this operation
-    # is required to work correctly. It should be fixed from pywebsocket side.
-    os.chdir(MakeDataDir())
-    server = WebSocketServer(WebSocketOptions(host, port, MakeDataDir()))
-    print 'WebSocket server started on %s:%d...' % (host, server.server_port)
-    server_data['port'] = server.server_port
   elif options.server_type == SERVER_SYNC:
     xmpp_port = options.xmpp_port
     server = SyncHTTPServer((host, port), xmpp_port, SyncPageHandler)
     print 'Sync HTTP server started on port %d...' % server.server_port
     print 'Sync XMPP server started on port %d...' % server.xmpp_port
     server_data['port'] = server.server_port
     server_data['xmpp_port'] = server.xmpp_port
   elif options.server_type == SERVER_TCP_ECHO:
     # Used for generating the key (randomly) that encodes the "echo request"
     # message.
@@ skipping 84 matching lines @@
                            help='start up a tcp echo server.')
   option_parser.add_option('', '--udp-echo', action='store_const',
                            const=SERVER_UDP_ECHO, default=SERVER_HTTP,
                            dest='server_type',
                            help='start up a udp echo server.')
   option_parser.add_option('', '--basic-auth-proxy', action='store_const',
                            const=SERVER_BASIC_AUTH_PROXY, default=SERVER_HTTP,
                            dest='server_type',
                            help='start up a proxy server which requires basic '
                            'authentication.')
-  option_parser.add_option('', '--websocket', action='store_const',
-                           const=SERVER_WEBSOCKET, default=SERVER_HTTP,
-                           dest='server_type',
-                           help='start up a WebSocket server.')
   option_parser.add_option('', '--log-to-console', action='store_const',
                            const=True, default=False,
                            dest='log_to_console',
                            help='Enables or disables sys.stdout logging to '
                            'the console.')
   option_parser.add_option('', '--port', default='0', type='int',
                            help='Port used by the server. If unspecified, the '
                            'server will listen on an ephemeral port.')
   option_parser.add_option('', '--xmpp-port', default='0', type='int',
                            help='Port used by the XMPP server. If unspecified, '
@@ skipping 62 matching lines @@
                            dest='host',
                            help='Hostname or IP upon which the server will '
                            'listen. Client connections will also only be '
                            'allowed from this address.')
   option_parser.add_option('', '--auth-token', dest='auth_token',
                            help='Specify the auth token which should be used'
                            'in the authorization header for GData.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))