Block box tests: disable telemetry_test, fix deep_links and web_debug…

…ger (#2986)

b/330355045

cobalt/black_box_tests/black_box_tests.py

@@ -87,7 +87,7 @@
     'service_worker_test',
     'service_worker_persist_test',
     'soft_mic_platform_service_test',
-    'telemetry_test',
+    # 'telemetry_test',
     'text_encoding_test',
     'wasm_basic_test',
     'web_debugger',

cobalt/black_box_tests/tests/deep_links.py

@@ -55,14 +55,26 @@
 _SERVER_ROOT_PATH = os.path.join(os.path.dirname(__file__), os.pardir)
 
 
+def is_deep_links_js(path):
+  """Check request path is for deep_links.js."""
+  parsed_path = urlparse(path)
+  return parsed_path.path == '/testdata/' + _DEEP_LINKS_JS
+
+
 class JavascriptRequestDetector(MakeRequestHandlerClass(_SERVER_ROOT_PATH)):
   """Proxies everything to SimpleHTTPRequestHandler, except some paths."""
 
+  def end_headers(self):
+    """Send the blank line ending the MIME headers."""
+    if is_deep_links_js(self.path):
+      # Prevent caching so |do_GET()| can delay response.
+      self.send_header('Cache-Control', 'no-store')
+
+    SimpleHTTPServer.SimpleHTTPRequestHandler.end_headers(self)
+
   def do_GET(self):  # pylint: disable=invalid-name
     """Handles HTTP GET requests for resources."""
-
-    parsed_path = urlparse(self.path)
-    if parsed_path.path == '/testdata/' + _DEEP_LINKS_JS:
+    if is_deep_links_js(self.path):
       # It is important not to send any response back, so we block.
       logging.info('Waiting on links to be fired.')
       _script_loading_signal.wait()

cobalt/debug/remote/debug_web_server.cc

@@ -207,7 +207,6 @@ void DebugWebServer::OnWebSocketMessage(int connection_id, std::string json) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK_EQ(connection_id, websocket_id_) << "Mismatched WebSocket ID";
 
-  // Parse the json string to get id, method and params.
   JSONObject json_object = JSONParse(json);
   if (json_object.empty()) {
     return SendErrorResponseOverWebSocket(websocket_id_, "Error parsing JSON");
@@ -221,19 +220,17 @@ void DebugWebServer::OnWebSocketMessage(int connection_id, std::string json) {
     return SendErrorResponseOverWebSocket(id.value(), "Missing method");
   }
   // Parameters are optional.
-  const base::Value* params_value = json_object.Find(kParamsField);
   std::string json_params;
-  if (json_object.Remove(kParamsField) && params_value->is_dict()) {
-    JSONObject params;
-    DCHECK(!params.empty());
-    json_params = JSONStringify(params);
+  const base::Value::Dict* params = json_object.FindDict(kParamsField);
+  if (params && !params->empty()) {
+    json_params = JSONStringify(*params);
+    json_object.Remove(kParamsField);
   }
 
   if (!debug_client_ || !debug_client_->IsAttached()) {
     return SendErrorResponseOverWebSocket(id.value(),
                                           "Debugger is not connected.");
   }
-
   debug_client_->SendCommand(*method, json_params,
                              base::Bind(&DebugWebServer::OnDebuggerResponse,
                                         base::Unretained(this), id.value()));
@@ -251,8 +248,12 @@ void DebugWebServer::SendErrorResponseOverWebSocket(
 
 void DebugWebServer::OnDebuggerResponse(
     int id, const base::Optional<std::string>& response) {
-  JSONObject response_object = JSONParse(response.value());
-  DCHECK(!response_object.empty());
+  std::string parse_error;
+  JSONObject response_object = JSONParse(response.value(), &parse_error);
+  DCHECK(parse_error.empty());
+  if (!parse_error.empty()) {
+    DLOG(ERROR) << "Parse response error: " << parse_error;
+  }
   response_object.Set(kIdField, id);
   server_->SendOverWebSocket(websocket_id_, JSONStringify(response_object),
                              kNetworkTrafficAnnotation);