commit 4f011ec64b71684e888900260ce3d41d495a9888
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 10:27:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 10:27:27 2020 +0000
tree a6c32a9868bc085a1b65e0be90b54c29e6aa3908
parent 29c6b2739e1714430024e6aab1fa5efe9b3186f8
parent c92c0ac35552d770722147785b14ba89167fdea8

Remove mosys platform call from get_platform_name am: c92c0ac355

Change-Id: Ib8e832ae71ad2906ff024592f446511a223518bc

client/cros/faft/rpc_functions.py

diff --git a/client/cros/faft/rpc_functions.py b/client/cros/faft/rpc_functions.py
index 07cba35..3b8a7d6 100644
--- a/client/cros/faft/rpc_functions.py
+++ b/client/cros/faft/rpc_functions.py
@@ -754,13 +754,12 @@
 
         @return: A string of the platform name.
         """
-        # 'mosys platform name' sometimes fails. Let's get the verbose output.
-        lines = self._os_if.run_shell_command_get_output(
-                '(mosys -vvv platform name 2>&1) || echo Failed')
-        if lines[-1].strip() == 'Failed':
-            raise Exception('Failed getting platform name: ' +
-                            '\n'.join(lines))
-        return lines[-1]
+        platform = cros_config.call_cros_config_get_output(
+                '/identity platform-name',
+                self._os_if.run_shell_command_get_result)
+        if not platform:
+            raise Exception('Failed getting platform name from cros_config')
+        return platform
 
     def get_model_name(self):
         """Get the model name of the current system.