reland: Launch pywebsocket via net::TestServer

net/tools/testserver/run_testserver.cc

 // 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.
 
 #include <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "net/test/local_sync_test_server.h"
 #include "net/test/python_utils.h"
 #include "net/test/test_server.h"
 
 static void PrintUsage() {
-  printf("run_testserver --doc-root=relpath [--http|--https|--ftp|--sync]\n"
-         "               [--https-cert=ok|mismatched-name|expired]\n"
+  printf("run_testserver --doc-root=relpath\n"
+         "               [--http|--https|--ws|--wss|--ftp|--sync]\n"
+         "               [--ssl-cert=ok|mismatched-name|expired]\n"
          "               [--port=<port>] [--xmpp-port=<xmpp_port>]\n");
   printf("(NOTE: relpath should be relative to the 'src' directory.\n");
   printf("       --port and --xmpp-port only work with the --sync flag.)\n");
 }
 
 // Launches the chromiumsync_test script, testing the --sync functionality.
 static bool RunSyncTest() {
  if (!net::TestServer::SetPythonPath()) {
     LOG(ERROR) << "Error trying to set python path. Exiting.";
     return false;
@@ skipping 64 matching lines @@
       ((command_line->HasSwitch("port") ||
         command_line->HasSwitch("xmpp-port")) &&
        !command_line->HasSwitch("sync"))) {
     PrintUsage();
     return -1;
   }
 
   net::TestServer::Type server_type(net::TestServer::TYPE_HTTP);
   if (command_line->HasSwitch("https")) {
     server_type = net::TestServer::TYPE_HTTPS;
+  } else if (command_line->HasSwitch("ws")) {
+    server_type = net::TestServer::TYPE_WS;
+  } else if (command_line->HasSwitch("wss")) {
+    server_type = net::TestServer::TYPE_WSS;
   } else if (command_line->HasSwitch("ftp")) {
     server_type = net::TestServer::TYPE_FTP;
   } else if (command_line->HasSwitch("sync")) {
     server_type = net::TestServer::TYPE_SYNC;
   } else if (command_line->HasSwitch("sync-test")) {
     return RunSyncTest() ? 0 : -1;
   }
 
   net::TestServer::SSLOptions ssl_options;
-  if (command_line->HasSwitch("https-cert")) {
-    server_type = net::TestServer::TYPE_HTTPS;
-    std::string cert_option = command_line->GetSwitchValueASCII("https-cert");
+  if (command_line->HasSwitch("ssl-cert")) {
+    if (server_type == net::TestServer::TYPE_HTTP)

[Ryan Sleevi, 2012/08/30 02:54:14]

Do you not need to also have a mapping of TYPE_WS -> TYPE_WSS?

[Takashi Toyoshima, 2012/08/31 17:38:20]

If no scheme option is specified, TYPE_HTTP is used as a default value.
I guess this line aims to support omitting scheme option for https.

WebSocket always requires scheme option, --ws or --wss.
So, auto type conversion looks confusing to me.
This is the reason why I didn't add WebSocket mapping here.

E.g., Handling "run_testserver --ssl-cert=ok" as https looks good, but handling
"run_testserver --ws --ssl-cert=ok" as wss looks curious. We may want to show
error message for this case. I feel that we should show warning on
"run_testserver --http --ssl-cert=ok", too. I revise this part to support proper
error on this.

+      server_type = net::TestServer::TYPE_HTTPS;
+    std::string cert_option = command_line->GetSwitchValueASCII("ssl-cert");
     if (cert_option == "ok") {
       ssl_options.server_certificate = net::TestServer::SSLOptions::CERT_OK;
     } else if (cert_option == "mismatched-name") {
       ssl_options.server_certificate =
           net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
     } else if (cert_option == "expired") {
       ssl_options.server_certificate =
           net::TestServer::SSLOptions::CERT_EXPIRED;
     } else {
       printf("Error: --https-cert has invalid value %s\n", cert_option.c_str());
       PrintUsage();
       return -1;
     }
   }
 
   FilePath doc_root = command_line->GetSwitchValuePath("doc-root");
   if ((server_type != net::TestServer::TYPE_SYNC) && doc_root.empty()) {
     printf("Error: --doc-root must be specified\n");
     PrintUsage();
     return -1;
   }
 
   scoped_ptr<net::TestServer> test_server;
   switch (server_type) {
-    case net::TestServer::TYPE_HTTPS: {
+    case net::TestServer::TYPE_HTTPS:
+    case net::TestServer::TYPE_WSS: {
       test_server.reset(new net::TestServer(server_type,
                                             ssl_options,
                                             doc_root));
       break;
     }
     case net::TestServer::TYPE_SYNC: {
       uint16 port = 0;
       uint16 xmpp_port = 0;
       if (!GetPortFromSwitch("port", &port) ||
           !GetPortFromSwitch("xmpp-port", &xmpp_port)) {
@@ skipping 21 matching lines @@
         UTF16ToUTF8(test_server->document_root().LossyDisplayName()).c_str());
     return -1;
   }
 
   printf("testserver running at %s (type ctrl+c to exit)\n",
          test_server->host_port_pair().ToString().c_str());
 
   message_loop.Run();
   return 0;
 }