Made testserver communicate to parent process with JSON

net/test/test_server.cc

 // Copyright (c) 2010 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>
 
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #include "net/base/x509_certificate.h"
 #endif
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
+#include "base/json/json_reader.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cert_test_util.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/test/python_utils.h"
 #include "testing/platform_test.h"
 
 namespace net {
@@ skipping 236 matching lines @@
 }
 
 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.Append(FILE_PATH_LITERAL("third_party"));
 
+  // For simplejson.
+  AppendToPythonPath(third_party_dir);

[cbentzel, 2010/11/17 22:32:50]

This should be third_party_dir.Append(FILE_PATH_LITERAL("simplejson"))

[akalin, 2010/11/17 23:21:35]

It should not -- the 'simplejson' directory, unlike all the other third_party
python modules, does not have another 'simplejson' directory underneath it so I
needed to include its parents.

[cbentzel, 2010/11/18 01:47:19]

Thanks. Could you expand the "For simplejson" comment about it? 

+
   AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("tlslite")));
   AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib")));
 
   // Locate the Python code generated by the protocol buffers compiler.
   FilePath pyproto_code_dir;
   if (!GetPyProtoPath(&pyproto_code_dir)) {
     LOG(ERROR) << "Failed to get python dir for generated code.";
     return false;
   }
 
@@ skipping 75 matching lines @@
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "aes128");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256)
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "aes256");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES)
       command_line->AppendSwitchASCII(kBulkCipherSwitch, "3des");
   }
 
   return true;
 }
 
+bool TestServer::ParseServerData(const std::string& server_data) {

[cbentzel, 2010/11/17 22:32:50]

Should this be non-mutating static and have an out-value argument for port? 

[akalin, 2010/11/17 23:21:35]

Hmm, in a future CL, the dict value is stashed in a member variable so clients
can access any non-port data (e.g., xmpp_port)

+  VLOG(1) << "Server data: " << server_data;
+  base::JSONReader json_reader;
+  scoped_ptr<Value> value(json_reader.JsonToValue(server_data, true, true));

[cbentzel, 2010/11/17 22:32:50]

Why is "allow trailing comma" needed - the parser does not need to be
permissive.

[akalin, 2010/11/17 23:21:35]

Done.

+  if (!value.get() ||
+      !value->IsType(Value::TYPE_DICTIONARY)) {
+    LOG(ERROR) << "Could not parse server data: "
+               << json_reader.GetErrorMessage();
+    return false;
+  }
+  DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
+  int port = 0;
+  if (!dict->GetInteger("port", &port) ||

[cbentzel, 2010/11/17 22:32:50]

I thought you were working on multiple ports? Or is that going to be in a
separate CL? 

[akalin, 2010/11/17 23:21:35]

Yeah, it'll be in a separate CL (i'll send it to you, too)

+      (port <= 0) || (port >= kuint16max)) {

[cbentzel, 2010/11/17 22:32:50]

I'd prefer splitting this into two different conditionals - one to check for
existence of "port" and one for doing the range checking.

[akalin, 2010/11/17 23:21:35]

Done.

+    LOG(ERROR) << "Could not find valid port value";
+    return false;
+  }
+  host_port_pair_.set_port(port);
+  return true;
+}
+
 }  // namespace net