commit 44bc3f73934541a6c3dbf81fbdb5cf40214aaff6
author Remi NGUYEN VAN <reminv@google.com> Tue Dec 24 13:34:27 2024 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Dec 24 13:36:57 2024 +0900
tree 6ced448ab59ba9a964bf955270e77d92f28d125b
parent 796fd42f785eed631e96f8e6d2463f1f56adb2e3

Replace executeAdbCommand with executeShellCommand

When an adb command starts with "shell", executeAdbCommand has special
logic to treat failures of the command as communication failures, and
try to recover the device. This causes instrumentation failures. See
NativeDevice.AdbShellAction#run.

Replace executeAdbCommand with executeShellCommand to avoid
instrumentation failures when the command does not succeed.

Test: atest ProcNetTest
Fixes: 385404810
Change-Id: I693f422f63cf592202ab3e49a9958c61f779b4d5

tests/cts/hostside/src/com/android/cts/net/ProcNetTest.java

diff --git a/tests/cts/hostside/src/com/android/cts/net/ProcNetTest.java b/tests/cts/hostside/src/com/android/cts/net/ProcNetTest.java
index ae572e6..b5e2450 100644
--- a/tests/cts/hostside/src/com/android/cts/net/ProcNetTest.java
+++ b/tests/cts/hostside/src/com/android/cts/net/ProcNetTest.java
@@ -91,8 +91,8 @@
     }
 
     private String[] getSysctlDirs() throws Exception {
-        String interfaceDirs[] = mDevice.executeAdbCommand("shell", "ls", "-1",
-                IPV6_SYSCTL_DIR).split("\n");
+        String[] interfaceDirs = mDevice.executeShellCommand("ls -1 " + IPV6_SYSCTL_DIR)
+                .split("\n");
         List<String> interfaceDirsList = new ArrayList<String>(Arrays.asList(interfaceDirs));
         interfaceDirsList.remove("all");
         interfaceDirsList.remove("lo");
@@ -109,13 +109,13 @@
     }
 
     public int readIntFromPath(String path) throws Exception {
-        String mode = mDevice.executeAdbCommand("shell", "stat", "-c", "%a", path).trim();
-        String user = mDevice.executeAdbCommand("shell", "stat", "-c", "%u", path).trim();
-        String group = mDevice.executeAdbCommand("shell", "stat", "-c", "%g", path).trim();
+        String mode = mDevice.executeShellCommand("stat -c %a " + path).trim();
+        String user = mDevice.executeShellCommand("stat -c %u " + path).trim();
+        String group = mDevice.executeShellCommand("stat -c %g " + path).trim();
         assertEquals(mode, "644");
         assertEquals(user, "0");
         assertEquals(group, "0");
-        return Integer.parseInt(mDevice.executeAdbCommand("shell", "cat", path).trim());
+        return Integer.parseInt(mDevice.executeShellCommand("cat " + path).trim());
     }
 
     /**
@@ -191,7 +191,7 @@
         assumeTrue(new DeviceSdkLevel(mDevice).isDeviceAtLeastV());
 
         String path = "/proc/sys/net/ipv4/tcp_congestion_control";
-        String value = mDevice.executeAdbCommand("shell", "cat", path).trim();
+        String value = mDevice.executeShellCommand("cat " + path).trim();
         assertEquals("cubic", value);
     }
 }