don't require "use_cvd" for CF snapshot support

Bug: 331861133
Test: TODO
Change-Id: I016cc0c8e71d7fa84c58d443db95dfceca24de7e

1 files changed, 4 insertions, 7 deletions

diff --git a/javatests/com/android/tradefed/device/connection/AdbSshConnectionTest.java b/javatests/com/android/tradefed/device/connection/AdbSshConnectionTest.java
index 87fbf8844..de7ad05fb 100644
--- a/javatests/com/android/tradefed/device/connection/AdbSshConnectionTest.java
+++ b/javatests/com/android/tradefed/device/connection/AdbSshConnectionTest.java
@@ -550,7 +550,6 @@ public class AdbSshConnectionTest {
         String snapshotId = "snapshot_user1";
         OptionSetter setter = new OptionSetter(mOptions);
         setter.setOptionValue("instance-user", instanceUser);
-        String cvdBin = String.format("/home/%s/bin/cvd", instanceUser);
         String snapshotPath = String.format("/tmp/%s/snapshots/%s", instanceUser, snapshotId);
         String snapshotCommandPath = String.format("--snapshot_path=%s", snapshotPath);
         String restoreSnapshotCommandPath = String.format("--snapshot_path=%s", snapshotPath);
@@ -609,8 +608,8 @@ public class AdbSshConnectionTest {
                         Mockito.eq("-i"),
                         Mockito.any(),
                         Mockito.eq(avdConnectHost),
-                        Mockito.eq(cvdBin),
-                        Mockito.eq("snapshot_take"),
+                        Mockito.eq(String.format("/home/%s/bin/snapshot_util_cvd", instanceUser)),
+                        Mockito.eq("--subcmd=snapshot_take"),
                         Mockito.eq("--force"),
                         Mockito.eq("--auto_suspend"),
                         Mockito.eq(snapshotCommandPath)))
@@ -631,8 +630,7 @@ public class AdbSshConnectionTest {
                         Mockito.eq("-i"),
                         Mockito.any(),
                         Mockito.eq(avdConnectHost),
-                        Mockito.eq(cvdBin),
-                        Mockito.eq("stop")))
+                        Mockito.eq(String.format("/home/%s/bin/stop_cvd", instanceUser))))
                 .thenReturn(successCmdResult);
         when(mMockRunUtil.runTimedCmd(
                         Mockito.anyLong(),
@@ -650,8 +648,7 @@ public class AdbSshConnectionTest {
                         Mockito.eq("-i"),
                         Mockito.any(),
                         Mockito.eq(avdConnectHost),
-                        Mockito.eq(cvdBin),
-                        Mockito.eq("start"),
+                        Mockito.eq(String.format("/home/%s/bin/launch_cvd", instanceUser)),
                         Mockito.eq(restoreSnapshotCommandPath)))
                 .thenReturn(successCmdResult);
         CommandResult adbResult = new CommandResult();