commit a612679375cf357f92d7824566ba77d7548cd260
author chojoyce <chojoyce@google.com> Tue Oct 08 18:45:02 2019 +0800
committer JOYCE CHO <chojoyce@google.com> Wed Oct 09 02:14:40 2019 +0000
tree 6fd0759da8a417a8773f206b458046decd9bea46
parent 3ca0709e5983cfb7172beb4eed4fe10e4ede84ea

acloud: check local-instance running command doesn't work.

Support both check launch_cvd(origin) and run_cvd(now).

BUG: 142295533
Test: acloud-dev create --local-instance --local-image
Change-Id: I8b1b2ac6094e23869c9164c8530623ade73cdf2a

create/local_image_local_instance.py

diff --git a/create/local_image_local_instance.py b/create/local_image_local_instance.py
index 4e5fb26..ffa9669 100644
--- a/create/local_image_local_instance.py
+++ b/create/local_image_local_instance.py
@@ -166,7 +166,8 @@
         # different dir (e.g. downloaded image).
         os.environ[_ENV_ANDROID_HOST_OUT] = host_bins_path
         # Cuttlefish support launch single AVD at one time currently.
-        if utils.IsCommandRunning(constants.CMD_LAUNCH_CVD):
+        if (utils.IsCommandRunning(constants.CMD_LAUNCH_CVD) or
+                utils.IsCommandRunning(constants.CMD_RUN_CVD)):
             logger.info("Cuttlefish AVD is already running.")
             if no_prompts or utils.GetUserAnswerYes(_CONFIRM_RELAUNCH):
                 stop_cvd_cmd = os.path.join(host_bins_path,

internal/constants.py

diff --git a/internal/constants.py b/internal/constants.py
index 86bb502..29be555 100755
--- a/internal/constants.py
+++ b/internal/constants.py
@@ -114,6 +114,7 @@
 COMMAND_PS = ["ps", "aux"]
 CMD_LAUNCH_CVD = "launch_cvd"
 CMD_STOP_CVD = "stop_cvd"
+CMD_RUN_CVD = "run_cvd"
 ENV_ANDROID_BUILD_TOP = "ANDROID_BUILD_TOP"
 ENV_ANDROID_EMULATOR_PREBUILTS = "ANDROID_EMULATOR_PREBUILTS"
 ENV_ANDROID_HOST_OUT = "ANDROID_HOST_OUT"