[sync] Add --port and --xmpp-port parameters to run_testserver.cc

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/test/test_timeouts.h"
+#include "base/string_number_conversions.h"

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

nit: Sort.

[Raghu Simha, 2012/05/23 19:54:28]

Done.

 #include "base/utf_string_conversions.h"
 #include "net/test/python_utils.h"
 #include "net/test/test_server.h"
+#include "net/test/local_sync_test_server.h"

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

nit: Sort.

[Raghu Simha, 2012/05/23 19:54:28]

Done.

 
 static void PrintUsage() {
   printf("run_testserver --doc-root=relpath [--http|--https|--ftp|--sync]\n"
-         "               [--https-cert=ok|mismatched-name|expired]\n");
-  printf("(NOTE: relpath should be relative to the 'src' directory)\n");
+         "               [--https-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");

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

Please add code to error out when those switches are used without --sync flag.
This way we're going to avoid a confusion when they're silently ignored.

[Raghu Simha, 2012/05/23 19:54:28]

Done.

 }
 
 // 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;
   }
 
   FilePath sync_test_path;
@@ skipping 12 matching lines @@
 
   CommandLine python_command(python_runtime);
   python_command.AppendArgPath(sync_test_path);
   if (!base::LaunchProcess(python_command, base::LaunchOptions(), NULL)) {
     LOG(ERROR) << "Failed to launch test script.";
     return false;
   }
   return true;
 }
 
+// Gets a port value from the switch with name |switch_name|.
+static uint16 GetPortFromSwitch(const std::string& switch_name) {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  int port_int = 0;
+  if (command_line->HasSwitch(switch_name)) {
+    std::string port_str = command_line->GetSwitchValueASCII(switch_name);
+    if (!base::StringToInt(port_str, &port_int)) {
+      LOG(WARNING) << "Could not extract port from switch " << switch_name;

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

How about making the function return bool success, and return port via
out-parameter? That would make the success unambiguous.

[Raghu Simha, 2012/05/23 19:54:28]

Done.

+      return 0;
+    }
+  }
+  return static_cast<uint16>(port_int);
+}
+
 int main(int argc, const char* argv[]) {
   base::AtExitManager at_exit_manager;
   MessageLoopForIO message_loop;
 
   // Process command line
   CommandLine::Init(argc, argv);
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (!logging::InitLogging(
           FILE_PATH_LITERAL("testserver.log"),
@@ skipping 43 matching lines @@
   }
 
   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;
-  if (server_type == net::TestServer::TYPE_HTTPS)
-    test_server.reset(new net::TestServer(https_options, doc_root));
-  else
-    test_server.reset(new net::TestServer(server_type,
-                                          net::TestServer::kLocalhost,
-                                          doc_root));
+  switch (server_type) {
+    case net::TestServer::TYPE_HTTPS: {

[akalin, 2012/05/23 06:16:49]

usual style is to leave the braces out unless necessary, but it's not a big deal

[Paweł Hajdan Jr., 2012/05/23 06:53:02]

+1, please do

[Raghu Simha, 2012/05/23 19:54:28]

Moot.

[Raghu Simha, 2012/05/23 19:54:28]

Moot.

+      test_server.reset(new net::TestServer(https_options, doc_root));
+      break;
+    }
+    case net::TestServer::TYPE_SYNC: {
+      test_server.reset(new net::LocalSyncTestServer(
+          GetPortFromSwitch("port"), GetPortFromSwitch("xmpp-port")));
+      break;
+    }
+    default: {
+      test_server.reset(new net::TestServer(server_type,
+                                            net::TestServer::kLocalhost,
+                                            doc_root));
+      break;
+    }
+  }
 
   if (!test_server->Start()) {
     printf("Error: failed to start test server. Exiting.\n");
     return -1;
   }
 
   if (!file_util::DirectoryExists(test_server->document_root())) {
     printf("Error: invalid doc root: \"%s\" does not exist!\n",
         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;
 }