Add "run_testserver --sync-test" for easy chromiumsync_test.py launching.

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/test/test_timeouts.h"
 #include "base/utf_string_conversions.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("(NOTE: relpath should be relative to the 'src' directory)\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;
+  }
+
+  FilePath sync_test_path(net::TestServer::GetTestServerDirectory());
+  if (sync_test_path.empty()) {
+    LOG(ERROR) << "Error trying to get python test server path.";
+    return false;
+  }
+
+  sync_test_path =
+      sync_test_path.Append(FILE_PATH_LITERAL("chromiumsync_test.py"));
+  FilePath python_runtime;
+  if (!GetPythonRunTime(&python_runtime)) {
+    LOG(ERROR) << "Could not get python runtime command.";
+    return false;
+  }
+
+  CommandLine python_command(python_runtime);
+  python_command.AppendArgPath(sync_test_path);
+  VLOG(1) << "Launching " << python_command.GetCommandLineString();

[Paweł Hajdan Jr., 2012/03/13 17:15:23]

Is this needed?

[tim (not reviewing), 2012/03/15 00:41:40]

Removed this one.

+  if (!base::LaunchProcess(python_command, base::LaunchOptions(), NULL)) {
+    LOG(ERROR) << "Failed to launch test script.";
+    return false;
+  }
+  return true;
+}
+
 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 12 matching lines @@
     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("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::HTTPSOptions https_options;
   if (command_line->HasSwitch("https-cert")) {
     server_type = net::TestServer::TYPE_HTTPS;
     std::string cert_option = command_line->GetSwitchValueASCII("https-cert");
     if (cert_option == "ok") {
       https_options.server_certificate = net::TestServer::HTTPSOptions::CERT_OK;
     } else if (cert_option == "mismatched-name") {
       https_options.server_certificate =
@@ skipping 33 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;
 }