firmware_test: use tpm_manager_client in firmware_test
BUG=b:175510138, b:174483629
TEST=test_that $DUT firmware_Cr50*
Change-Id: I7f36af881fbf10522c719a65c2f0e3f59841272a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2589054
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Leo Lai <cylai@google.com>
Commit-Queue: Yi Chou <yich@google.com>
Tested-by: Yi Chou <yich@google.com>
diff --git a/server/cros/faft/firmware_test.py b/server/cros/faft/firmware_test.py
index febee71..5e7aa8f 100644
--- a/server/cros/faft/firmware_test.py
+++ b/server/cros/faft/firmware_test.py
@@ -2164,17 +2164,17 @@
def _tpm_is_owned(self):
"""Returns True if the tpm is owned"""
- result = self.host.run('cryptohome --action=tpm_more_status',
+ result = self.host.run('tpm_manager_client status --nonsensitive',
ignore_status=True)
logging.debug(result)
- return result.exit_status == 0 and 'owned: true' in result.stdout
+ return result.exit_status == 0 and 'is_owned: true' in result.stdout
def clear_fwmp(self):
"""Clear the FWMP"""
if self.fwmp_is_cleared():
return
tpm_utils.ClearTPMOwnerRequest(self.host, wait_for_ready=True)
- self.host.run('cryptohome --action=tpm_take_ownership')
+ self.host.run('tpm_manager_client take_ownership')
if not utils.wait_for_value(self._tpm_is_owned, expected_value=True):
raise error.TestError('Unable to own tpm while clearing fwmp.')
self.host.run('cryptohome '