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

net/test/test_server.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 "net/test/test_server.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 80 matching lines @@
 
   Init(host, document_root);
 }
 
 TestServer::~TestServer() {
   TestRootCerts* root_certs = TestRootCerts::GetInstance();
   root_certs->Clear();
   Stop();
 }
 
+FilePath TestServer::GetTestServerDirectory() {
+  // Get path to python server script.
+  FilePath testserver_dir;
+  if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
+    LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
+    return FilePath();
+  }
+
+  testserver_dir = testserver_dir
+      .Append(FILE_PATH_LITERAL("net"))
+      .Append(FILE_PATH_LITERAL("tools"))
+      .Append(FILE_PATH_LITERAL("testserver"));
+  return testserver_dir;
+}
+
 bool TestServer::Start() {
   if (type_ == TYPE_HTTPS) {
     if (!LoadTestRootCert())
       return false;
   }
 
-  // Get path to python server script
-  FilePath testserver_path;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_path)) {
-    LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
+  FilePath testserver_path(GetTestServerDirectory());
+  if (testserver_path.empty())
     return false;
-  }
-  testserver_path = testserver_path
-      .Append(FILE_PATH_LITERAL("net"))
-      .Append(FILE_PATH_LITERAL("tools"))
-      .Append(FILE_PATH_LITERAL("testserver"))
-      .Append(FILE_PATH_LITERAL("testserver.py"));
+  testserver_path =
+      testserver_path.Append(FILE_PATH_LITERAL("testserver.py"));
 
   if (!SetPythonPath())
     return false;
 
   if (!LaunchPython(testserver_path))
     return false;
 
   if (!WaitToStart()) {
     Stop();
     return false;
@@ skipping 148 matching lines @@
   certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net"))
                        .Append(FILE_PATH_LITERAL("data"))
                        .Append(FILE_PATH_LITERAL("ssl"))
                        .Append(FILE_PATH_LITERAL("certificates"));
 
   // TODO(battre) Remove this after figuring out why the TestServer is flaky.
   // http://crbug.com/96594
   log_to_console_ = true;
 }
 
+// static
+bool TestServer::RunSyncTest() {
+ if (!SetPythonPath()) {
+    LOG(ERROR) << "Error trying to set python path. Exiting.";
+    return false;
+  }
+
+  FilePath sync_test_path(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"));
+  CommandLine python_command(GetAbsolutePythonCommandPath());
+  python_command.AppendArgPath(sync_test_path);
+  if (!base::LaunchProcess(python_command, base::LaunchOptions(), NULL)) {

[akalin, 2012/03/03 01:18:32]

can you add a VLOG of the final command line somewhere?  even better if you can
do it for the testserver

hmm i wonder if launchprocess has something like that already?

+    LOG(ERROR) << "Failed to launch test script.";
+    return false;
+  }
+  return true;
+}
+
 bool TestServer::SetPythonPath() {
   FilePath third_party_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
   third_party_dir = third_party_dir.AppendASCII("third_party");
 
   // For simplejson. (simplejson, unlike all the other python modules
   // we include, doesn't have an extra 'simplejson' directory, so we
@@ skipping 116 matching lines @@
       command_line->AppendArg(kBulkCipherSwitch + "=3des");
 
     if (https_options_.record_resume)
       command_line->AppendArg("--https-record-resume");
   }
 
   return true;
 }
 
 }  // namespace net