From a3462661c8ffd49499b366cdc2487d9426b820a5 Mon Sep 17 00:00:00 2001
From: Michael Checo <michaelcheco@google.com>
Date: Wed, 13 Oct 2021 00:33:50 +0000
Subject: [PATCH] Diagnostics: Make gateway test non-blocking

- This change also moves the ARC Ping test to the Local Network
  group.

Bug: 1197335
Change-Id: Id5f58b31d5e01dc5c7cdf29cd8c036f6e6d606fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3218356
Reviewed-by: Jimmy Gong <jimmyxgong@chromium.org>
Commit-Queue: Michael Checo <michaelcheco@google.com>
Cr-Commit-Position: refs/heads/main@{#930876}
---
 .../resources/diagnostics_utils.js            |  5 ++---
 .../diagnostics/diagnostics_utils_test.js     | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ash/webui/diagnostics_ui/resources/diagnostics_utils.js b/ash/webui/diagnostics_ui/resources/diagnostics_utils.js
index 4a350265ccdaf4..f80e99692798e6 100644
--- a/ash/webui/diagnostics_ui/resources/diagnostics_utils.js
+++ b/ash/webui/diagnostics_ui/resources/diagnostics_utils.js
@@ -125,7 +125,7 @@ export function createRoutine(routine, blocking) {
 export function getRoutineGroups(type, isArcEnabled) {
   let localNetworkGroup = new RoutineGroup(
       [
-        createRoutine(RoutineType.kGatewayCanBePinged, true),
+        createRoutine(RoutineType.kGatewayCanBePinged, false),
         createRoutine(RoutineType.kLanConnectivity, true),
       ],
       'localNetworkGroupLabel');
@@ -157,8 +157,7 @@ export function getRoutineGroups(type, isArcEnabled) {
     // Add ARC routines to their corresponding groups.
     nameResolutionGroup.addRoutine(
         (createRoutine(RoutineType.kArcDnsResolution, false)));
-    internetConnectivityGroup.addRoutine(
-        (createRoutine(RoutineType.kArcPing, false)));
+    localNetworkGroup.addRoutine((createRoutine(RoutineType.kArcPing, false)));
     internetConnectivityGroup.addRoutine(
         (createRoutine(RoutineType.kArcHttp, false)));
   }
diff --git a/chrome/test/data/webui/chromeos/diagnostics/diagnostics_utils_test.js b/chrome/test/data/webui/chromeos/diagnostics/diagnostics_utils_test.js
index b001d3374c96f9..143e4cf2a321fc 100644
--- a/chrome/test/data/webui/chromeos/diagnostics/diagnostics_utils_test.js
+++ b/chrome/test/data/webui/chromeos/diagnostics/diagnostics_utils_test.js
@@ -64,23 +64,26 @@ export function diagnosticsUtilsTestSuite() {
     loadTimeData.overrideValues({enableArcNetworkDiagnostics: true});
     let isArcEnabled = loadTimeData.getBoolean('enableArcNetworkDiagnostics');
     let routineGroups = getRoutineGroups(NetworkType.kWiFi, isArcEnabled);
+    let [
+      localNetworkGroup,
+       nameResolutionGroup,
+       wifiGroup,
+       internetConnectivityGroup,
+      ]
+      = routineGroups;
 
     // All groups should be present.
     assertEquals(routineGroups.length, 4);
 
     // WiFi group should exist and all three WiFi routines should be present.
-    let wifiGroup = routineGroups[2];
     assertEquals(wifiGroup.routines.length, 3);
     assertEquals(wifiGroup.groupName, 'wifiGroupLabel');
 
     // ARC routines should be present in their categories.
-    let nameResolutionGroup = routineGroups[1];
     assertTrue(
         nameResolutionGroup.routines.includes(RoutineType.kArcDnsResolution));
 
-    let internetConnectivityGroup = routineGroups[3];
-    assertTrue(
-        internetConnectivityGroup.routines.includes(RoutineType.kArcPing));
+    assertTrue(localNetworkGroup.routines.includes(RoutineType.kArcPing));
     assertTrue(
         internetConnectivityGroup.routines.includes(RoutineType.kArcHttp));
   });
@@ -98,14 +101,12 @@ export function diagnosticsUtilsTestSuite() {
     loadTimeData.overrideValues({enableArcNetworkDiagnostics: false});
     let isArcEnabled = loadTimeData.getBoolean('enableArcNetworkDiagnostics');
     let routineGroups = getRoutineGroups(NetworkType.kEthernet, isArcEnabled);
-
-    let nameResolutionGroup = routineGroups[1];
+    let [localNetworkGroup, nameResolutionGroup, internetConnectivityGroup] =
+        routineGroups;
     assertFalse(
         nameResolutionGroup.routines.includes(RoutineType.kArcDnsResolution));
 
-    let internetConnectivityGroup = routineGroups[2];
-    assertFalse(
-        internetConnectivityGroup.routines.includes(RoutineType.kArcPing));
+    assertFalse(localNetworkGroup.routines.includes(RoutineType.kArcPing));
     assertFalse(
         internetConnectivityGroup.routines.includes(RoutineType.kArcHttp));
   });