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 61 matching lines @@
 
   if (command_line->GetSwitches().empty() ||
       command_line->HasSwitch("help") ||
       ((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")) {
+  net::TestServer::Type server_type;
+  if (command_line->HasSwitch("http")) {
+    server_type = net::TestServer::TYPE_HTTP;
+  } else 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;
+  } else {
+    // If no scheme switch is specified, select http or https scheme.

[Paweł Hajdan Jr., 2012/09/01 07:39:10]

I don't like this implicit handling of flags. This also duplicates --http and
--https logic above.

It is preferable to throw an error rather than implicitly do something. Follow
the principle of least surprise.

[Takashi Toyoshima, 2012/09/01 08:36:59]

This behavior is originally implemented in Line 104, 116-117 of the original
source. I'm afraid that removing this estimation may break some other dependent
tools. What do you think from the viewpoint of compatibility. If this was not
implemented originally, I'd totally agreed with your opinion.

[Paweł Hajdan Jr., 2012/09/04 09:28:01]

Ah, right - the new version just makes it more obvious (which is good).
Makes sense. I think run_testserver is just a tool for developers. Compatibility
shouldn't be a big concern here. Feel free to add a TODO here to make this CL
safer to land.

[Takashi Toyoshima, 2012/09/11 06:36:32]

Done.

+    if (command_line->HasSwitch("ssl-cert"))
+      server_type = net::TestServer::TYPE_HTTPS;
+    else
+      server_type = net::TestServer::TYPE_HTTP;
   }
 
   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 ||
+        server_type == net::TestServer::TYPE_WS) {
+      printf("Error: --ssl-cert is specified on non-secure scheme\n");
+      PrintUsage();
+      return -1;
+    }
+    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());
+      printf("Error: --ssl-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;
 }