commit 4a535d4bf3036b8069a14487e5a430420b83cb24
author Cherie Cheung <cherieccy@google.com> Sat Jun 19 00:02:19 2021 +0900
committer Commit Bot <commit-bot@chromium.org> Mon Jul 26 02:03:39 2021 +0000
tree c4ef4b3d168b166022a2a52d0f7fc699412d2888
parent 9c0b391608dc5af4b4121f7dc4ce93d7febf12c6

power_UiResume: Do not _enable_arc for ARCVM.

Autotest is not supported by ARCVM. When running on DUT with ARCVM,
do not run test with _enable_arc option.

BUG=b:188637322
TEST=Run autotest on devices
With ARC++ container, power_UiResume will run test with _enable_arc.
With ARCVM, power_UiResume will not run test with _enable_arc.

Change-Id: I3d317427670c1ea4e4f311e0c51b9df8117433dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2972341
Reviewed-by: Mengqi Guo <mqg@chromium.org>
Reviewed-by: Puthikorn Voravootivat <puthik@chromium.org>
Tested-by: Cherie Cheung <cherieccy@google.com>
Commit-Queue: Cherie Cheung <cherieccy@google.com>
(cherry picked from commit 17d46ec5c4ae09655632d7486cd6d835cc822125)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3047398
Tested-by: zanxi chen <chenzanxi@huaqin.corp-partner.google.com>
Reviewed-by: Cherie Cheung <cherieccy@google.com>
Owners-Override: Cherie Cheung <cherieccy@google.com>

client/bin/utils.py

diff --git a/client/bin/utils.py b/client/bin/utils.py
index f229f24..4396c01 100644
--- a/client/bin/utils.py
+++ b/client/bin/utils.py
@@ -1765,6 +1765,22 @@
     return get_board_property('CHROMEOS_RELEASE_VERSION')
 
 
+def get_android_version():
+    """
+    Get the Android SDK version from /etc/lsb-release.
+
+    @return android sdk version.
+    """
+    return get_board_property('CHROMEOS_ARC_ANDROID_SDK_VERSION')
+
+
+def is_arcvm():
+    try:
+        return int(get_android_version()) >= 30
+    except:
+        return False
+
+
 def get_platform():
     """
     Get the ChromeOS platform name.

client/site_tests/power_UiResume/power_UiResume.py

diff --git a/client/site_tests/power_UiResume/power_UiResume.py b/client/site_tests/power_UiResume/power_UiResume.py
index 291fc09..410be16 100644
--- a/client/site_tests/power_UiResume/power_UiResume.py
+++ b/client/site_tests/power_UiResume/power_UiResume.py
@@ -28,7 +28,10 @@
         in Chrome browser.
 
         """
-        self._enable_arc = utils.is_arc_available() and not no_arc
+        # TODO(b/191251229): Only enable ARC if ARC is available and it is not
+        # running ARCVM.
+        self._enable_arc = (utils.is_arc_available() and not utils.is_arcvm()
+                            and not no_arc)
         if self._enable_arc:
             super(power_UiResume, self).initialize()
         else: