Merge "suppress warnings from ssh related commands" am: 58f2dcd8cctemp_sam_202323961

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1844837

Change-Id: Id995e6a0c4d2b26f6817c179990b988cf76cbe37

5 files changed, 119 insertions, 88 deletions

diff --git a/javatests/com/android/tradefed/device/cloud/GceManagerTest.java b/javatests/com/android/tradefed/device/cloud/GceManagerTest.java
index 6c0e58cfe..883f86536 100644
--- a/javatests/com/android/tradefed/device/cloud/GceManagerTest.java
+++ b/javatests/com/android/tradefed/device/cloud/GceManagerTest.java
@@ -724,6 +724,8 @@ public class GceManagerTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -738,6 +740,8 @@ public class GceManagerTest {
                         Mockito.anyLong(),
                         Mockito.eq("scp"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -775,6 +779,8 @@ public class GceManagerTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -794,6 +800,8 @@ public class GceManagerTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -810,6 +818,8 @@ public class GceManagerTest {
                         Mockito.anyLong(),
                         Mockito.eq("scp"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -847,6 +857,8 @@ public class GceManagerTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
diff --git a/javatests/com/android/tradefed/device/cloud/GceRemoteCmdFormatterTest.java b/javatests/com/android/tradefed/device/cloud/GceRemoteCmdFormatterTest.java
index 89a291274..c02c5e006 100644
--- a/javatests/com/android/tradefed/device/cloud/GceRemoteCmdFormatterTest.java
+++ b/javatests/com/android/tradefed/device/cloud/GceRemoteCmdFormatterTest.java
@@ -37,16 +37,18 @@ public class GceRemoteCmdFormatterTest {
                         new File("/tmp/key"), null, "root", "127.0.0.1", "stop", "adbd");
         assertEquals("ssh", res.get(0));
         assertEquals("-o", res.get(1));
-        assertEquals("UserKnownHostsFile=/dev/null", res.get(2));
+        assertEquals("LogLevel=ERROR", res.get(2));
         assertEquals("-o", res.get(3));
-        assertEquals("StrictHostKeyChecking=no", res.get(4));
+        assertEquals("UserKnownHostsFile=/dev/null", res.get(4));
         assertEquals("-o", res.get(5));
-        assertEquals("ServerAliveInterval=10", res.get(6));
-        assertEquals("-i", res.get(7));
-        assertEquals("/tmp/key", res.get(8));
-        assertEquals("root@127.0.0.1", res.get(9));
-        assertEquals("stop", res.get(10));
-        assertEquals("adbd", res.get(11));
+        assertEquals("StrictHostKeyChecking=no", res.get(6));
+        assertEquals("-o", res.get(7));
+        assertEquals("ServerAliveInterval=10", res.get(8));
+        assertEquals("-i", res.get(9));
+        assertEquals("/tmp/key", res.get(10));
+        assertEquals("root@127.0.0.1", res.get(11));
+        assertEquals("stop", res.get(12));
+        assertEquals("adbd", res.get(13));
     }
 
     @Test
@@ -62,14 +64,16 @@ public class GceRemoteCmdFormatterTest {
                         ScpMode.PULL);
         assertEquals("scp", res.get(0));
         assertEquals("-o", res.get(1));
-        assertEquals("UserKnownHostsFile=/dev/null", res.get(2));
+        assertEquals("LogLevel=ERROR", res.get(2));
         assertEquals("-o", res.get(3));
-        assertEquals("StrictHostKeyChecking=no", res.get(4));
+        assertEquals("UserKnownHostsFile=/dev/null", res.get(4));
         assertEquals("-o", res.get(5));
-        assertEquals("ServerAliveInterval=10", res.get(6));
-        assertEquals("-i", res.get(7));
-        assertEquals("/tmp/key", res.get(8));
-        assertEquals("root@127.0.0.1:/sdcard/test", res.get(9));
-        assertEquals("/tmp/here", res.get(10));
+        assertEquals("StrictHostKeyChecking=no", res.get(6));
+        assertEquals("-o", res.get(7));
+        assertEquals("ServerAliveInterval=10", res.get(8));
+        assertEquals("-i", res.get(9));
+        assertEquals("/tmp/key", res.get(10));
+        assertEquals("root@127.0.0.1:/sdcard/test", res.get(11));
+        assertEquals("/tmp/here", res.get(12));
     }
 }
diff --git a/javatests/com/android/tradefed/device/cloud/RemoteAndroidVirtualDeviceTest.java b/javatests/com/android/tradefed/device/cloud/RemoteAndroidVirtualDeviceTest.java
index 3b1654ad7..a0d9050b6 100644
--- a/javatests/com/android/tradefed/device/cloud/RemoteAndroidVirtualDeviceTest.java
+++ b/javatests/com/android/tradefed/device/cloud/RemoteAndroidVirtualDeviceTest.java
@@ -862,6 +862,8 @@ public class RemoteAndroidVirtualDeviceTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -927,6 +929,8 @@ public class RemoteAndroidVirtualDeviceTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
@@ -948,6 +952,8 @@ public class RemoteAndroidVirtualDeviceTest {
                         Mockito.eq(stderr),
                         Mockito.eq("ssh"),
                         Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
                         Mockito.eq("UserKnownHostsFile=/dev/null"),
                         Mockito.eq("-o"),
                         Mockito.eq("StrictHostKeyChecking=no"),
diff --git a/javatests/com/android/tradefed/device/cloud/RemoteFileUtilTest.java b/javatests/com/android/tradefed/device/cloud/RemoteFileUtilTest.java
index 0c421a342..8cd9e21a3 100644
--- a/javatests/com/android/tradefed/device/cloud/RemoteFileUtilTest.java
+++ b/javatests/com/android/tradefed/device/cloud/RemoteFileUtilTest.java
@@ -56,20 +56,21 @@ public class RemoteFileUtilTest {
         GceAvdInfo fakeInfo = new GceAvdInfo("ins-gce", HostAndPort.fromHost("127.0.0.1"));
         String remotePath = "/home/vsoc-01/cuttlefish_runtime/kernel.log";
         CommandResult res = new CommandResult(CommandStatus.SUCCESS);
-        when(
-                        mMockRunUtil.runTimedCmd(
-                                Mockito.anyLong(),
-                                Mockito.eq("scp"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("UserKnownHostsFile=/dev/null"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("StrictHostKeyChecking=no"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("ServerAliveInterval=10"),
-                                Mockito.eq("-i"),
-                                Mockito.any(),
-                                Mockito.eq("root@127.0.0.1:" + remotePath),
-                                Mockito.any()))
+        when(mMockRunUtil.runTimedCmd(
+                        Mockito.anyLong(),
+                        Mockito.eq("scp"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("UserKnownHostsFile=/dev/null"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("StrictHostKeyChecking=no"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("ServerAliveInterval=10"),
+                        Mockito.eq("-i"),
+                        Mockito.any(),
+                        Mockito.eq("root@127.0.0.1:" + remotePath),
+                        Mockito.any()))
                 .thenReturn(res);
 
         File resFile = null;
@@ -91,20 +92,21 @@ public class RemoteFileUtilTest {
         String remotePath = "/home/vsoc-01/cuttlefish_runtime/kernel.log";
         CommandResult res = new CommandResult(CommandStatus.FAILED);
         res.setStderr("Failed to fetch file.");
-        when(
-                        mMockRunUtil.runTimedCmd(
-                                Mockito.anyLong(),
-                                Mockito.eq("scp"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("UserKnownHostsFile=/dev/null"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("StrictHostKeyChecking=no"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("ServerAliveInterval=10"),
-                                Mockito.eq("-i"),
-                                Mockito.any(),
-                                Mockito.eq("root@127.0.0.1:" + remotePath),
-                                Mockito.any()))
+        when(mMockRunUtil.runTimedCmd(
+                        Mockito.anyLong(),
+                        Mockito.eq("scp"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("UserKnownHostsFile=/dev/null"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("StrictHostKeyChecking=no"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("ServerAliveInterval=10"),
+                        Mockito.eq("-i"),
+                        Mockito.any(),
+                        Mockito.eq("root@127.0.0.1:" + remotePath),
+                        Mockito.any()))
                 .thenReturn(res);
 
         File resFile =
@@ -118,21 +120,22 @@ public class RemoteFileUtilTest {
         GceAvdInfo fakeInfo = new GceAvdInfo("ins-gce", HostAndPort.fromHost("127.0.0.1"));
         String remotePath = "/home/vsoc-01/cuttlefish_runtime/tombstones";
         CommandResult res = new CommandResult(CommandStatus.SUCCESS);
-        when(
-                        mMockRunUtil.runTimedCmd(
-                                Mockito.anyLong(),
-                                Mockito.eq("scp"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("UserKnownHostsFile=/dev/null"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("StrictHostKeyChecking=no"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("ServerAliveInterval=10"),
-                                Mockito.eq("-i"),
-                                Mockito.any(),
-                                Mockito.eq("-r"),
-                                Mockito.eq("root@127.0.0.1:" + remotePath),
-                                Mockito.any()))
+        when(mMockRunUtil.runTimedCmd(
+                        Mockito.anyLong(),
+                        Mockito.eq("scp"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("UserKnownHostsFile=/dev/null"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("StrictHostKeyChecking=no"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("ServerAliveInterval=10"),
+                        Mockito.eq("-i"),
+                        Mockito.any(),
+                        Mockito.eq("-r"),
+                        Mockito.eq("root@127.0.0.1:" + remotePath),
+                        Mockito.any()))
                 .thenReturn(res);
         File resDir = null;
         try {
@@ -153,21 +156,22 @@ public class RemoteFileUtilTest {
         String remotePath = "/home/vsoc-01/cuttlefish_runtime/kernel.log";
         CommandResult res = new CommandResult(CommandStatus.SUCCESS);
         File localFile = FileUtil.createTempDir("test-remote-push-dir");
-        when(
-                        mMockRunUtil.runTimedCmd(
-                                Mockito.anyLong(),
-                                Mockito.eq("scp"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("UserKnownHostsFile=/dev/null"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("StrictHostKeyChecking=no"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("ServerAliveInterval=10"),
-                                Mockito.eq("-i"),
-                                Mockito.any(),
-                                Mockito.eq("-R"),
-                                Mockito.eq(localFile.getAbsolutePath()),
-                                Mockito.eq("root@127.0.0.1:" + remotePath)))
+        when(mMockRunUtil.runTimedCmd(
+                        Mockito.anyLong(),
+                        Mockito.eq("scp"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("UserKnownHostsFile=/dev/null"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("StrictHostKeyChecking=no"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("ServerAliveInterval=10"),
+                        Mockito.eq("-i"),
+                        Mockito.any(),
+                        Mockito.eq("-R"),
+                        Mockito.eq(localFile.getAbsolutePath()),
+                        Mockito.eq("root@127.0.0.1:" + remotePath)))
                 .thenReturn(res);
 
         try {
@@ -194,21 +198,22 @@ public class RemoteFileUtilTest {
         CommandResult res = new CommandResult(CommandStatus.FAILED);
         res.setStderr("failed to push to remote.");
         File localFile = FileUtil.createTempDir("test-remote-push-dir");
-        when(
-                        mMockRunUtil.runTimedCmd(
-                                Mockito.anyLong(),
-                                Mockito.eq("scp"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("UserKnownHostsFile=/dev/null"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("StrictHostKeyChecking=no"),
-                                Mockito.eq("-o"),
-                                Mockito.eq("ServerAliveInterval=10"),
-                                Mockito.eq("-i"),
-                                Mockito.any(),
-                                Mockito.eq("-R"),
-                                Mockito.eq(localFile.getAbsolutePath()),
-                                Mockito.eq("root@127.0.0.1:" + remotePath)))
+        when(mMockRunUtil.runTimedCmd(
+                        Mockito.anyLong(),
+                        Mockito.eq("scp"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("LogLevel=ERROR"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("UserKnownHostsFile=/dev/null"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("StrictHostKeyChecking=no"),
+                        Mockito.eq("-o"),
+                        Mockito.eq("ServerAliveInterval=10"),
+                        Mockito.eq("-i"),
+                        Mockito.any(),
+                        Mockito.eq("-R"),
+                        Mockito.eq(localFile.getAbsolutePath()),
+                        Mockito.eq("root@127.0.0.1:" + remotePath)))
                 .thenReturn(res);
 
         try {
diff --git a/src/com/android/tradefed/device/cloud/GceRemoteCmdFormatter.java b/src/com/android/tradefed/device/cloud/GceRemoteCmdFormatter.java
index 2d45972ec..2bbee4aeb 100644
--- a/src/com/android/tradefed/device/cloud/GceRemoteCmdFormatter.java
+++ b/src/com/android/tradefed/device/cloud/GceRemoteCmdFormatter.java
@@ -50,6 +50,8 @@ public class GceRemoteCmdFormatter {
         List<String> cmd = new ArrayList<>();
         cmd.add("ssh");
         cmd.add("-o");
+        cmd.add("LogLevel=ERROR");
+        cmd.add("-o");
         cmd.add("UserKnownHostsFile=/dev/null");
         cmd.add("-o");
         cmd.add("StrictHostKeyChecking=no");
@@ -92,6 +94,8 @@ public class GceRemoteCmdFormatter {
         List<String> cmd = new ArrayList<>();
         cmd.add("scp");
         cmd.add("-o");
+        cmd.add("LogLevel=ERROR");
+        cmd.add("-o");
         cmd.add("UserKnownHostsFile=/dev/null");
         cmd.add("-o");
         cmd.add("StrictHostKeyChecking=no");