Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096 am: 19f3aab438 am: ef2f29d2b3

Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030

Change-Id: I49cd668d1050a3ea1eb8db8c0644f0c9a278e1d2

1 files changed, 21 insertions, 0 deletions

diff --git a/catapult/devil/devil/devil_env_test.py b/catapult/devil/devil/devil_env_test.py
index ee7cd8fd..65fd7047 100755
--- a/catapult/devil/devil/devil_env_test.py
+++ b/catapult/devil/devil/devil_env_test.py
@@ -10,6 +10,7 @@ import sys
 import unittest
 
 from devil import devil_env
+from devil.android.ndk import abis
 
 _sys_path_before = list(sys.path)
 with devil_env.SysPath(devil_env.PYMOCK_PATH):
@@ -18,6 +19,11 @@ with devil_env.SysPath(devil_env.PYMOCK_PATH):
 _sys_path_after = list(sys.path)
 
 
+class _MockDeviceUtils(object):
+  def __init__(self):
+    self.product_cpu_abi = abis.ARM_64
+
+
 class DevilEnvTest(unittest.TestCase):
   def testSysPath(self):
     self.assertEquals(_sys_path_before, _sys_path_after)
@@ -52,6 +58,21 @@ class DevilEnvTest(unittest.TestCase):
         },
     }, env_config.get('dependencies'))
 
+  def testGetPlatform(self):
+    with mock.patch('platform.machine', mock.Mock(return_value='x86_64')):
+      with mock.patch('sys.platform', mock.Mock(return_value='linux2')):
+        platform = devil_env.GetPlatform()
+        self.assertEquals(platform, 'linux2_x86_64')
+      with mock.patch('sys.platform', mock.Mock(return_value='linux')):
+        platform = devil_env.GetPlatform()
+        self.assertEquals(platform, 'linux2_x86_64')
+
+    platform = devil_env.GetPlatform(arch='arm64-v8a')
+    self.assertEquals(platform, 'android_arm64-v8a')
+
+    device = _MockDeviceUtils()
+    platform = devil_env.GetPlatform(device=device)
+    self.assertEquals(platform, 'android_arm64-v8a')
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)