firmware_Cr50TpmMode: remove can_set_tpm
All images can set the tpm mode now. Remove support for checking that a
board can't set the tpm mode.
BUG=none
TEST=run on hatch
Change-Id: Iee8a0999634b5c8bcee3d7bf0d3937b797ea035d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3158727
Reviewed-by: Aadit Maheshkumar Modi <modia@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Auto-Submit: Mary Ruthven <mruthven@chromium.org>
diff --git a/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py b/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py
index 3607e1f..047f74d 100644
--- a/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py
+++ b/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py
@@ -9,34 +9,14 @@
class firmware_Cr50TpmMode(Cr50Test):
- """Verify TPM disabling and getting back enabled after reset.
-
- Attributes:
- can_set_tpm: True if board property has 'BOARD_ALLOW_CHANGE_TPM_MODE'.
- False, otherwise.
- """
+ """Verify TPM disabling and getting back enabled after reset."""
version = 1
- def initialize(self, host, cmdline_args, full_args):
- super(firmware_Cr50TpmMode, self).initialize(host, cmdline_args,
- full_args)
-
- # TODO(mruthven): remove can_set_tpm logic when tpm mode propagates to
- # mp.
- always_enabled = '0.6.51' in self.cr50.get_active_version_info()
- logging.info('Running version %s tpm mode based on brdprop',
- 'does not enable' if always_enabled else 'enables')
- self.can_set_tpm = always_enabled or self.cr50.uses_board_property(
- 'BOARD_ALLOW_CHANGE_TPM_MODE')
- logging.info('Board can%s set tpm mode',
- '' if self.can_set_tpm else 'not')
-
def init_tpm_mode(self):
"""Reset the device."""
- if self.can_set_tpm:
- logging.info('Reset')
- self.host.reset_via_servo()
- self.switcher.wait_for_client()
+ logging.info('Reset')
+ self.host.reset_via_servo()
+ self.switcher.wait_for_client()
def cleanup(self):
"""Initialize TPM mode by resetting CR50"""
@@ -109,20 +89,8 @@
# Change TPM Mode
logging.info('Set TPM Mode')
- if self.can_set_tpm:
- output_log = self.set_tpm_mode(disable_tpm, long_opt)
- logging.info(output_log)
- else:
- try:
- output_log = self.set_tpm_mode(disable_tpm, long_opt)
- except error.AutoservRunError as e:
- logging.info('Failed to set TPM mode as expected')
- logging.info(str(e))
- else:
- raise error.TestFail('Setting TPM mode should not be allowed')
- finally:
- logging.info(output_log)
- return
+ output_log = self.set_tpm_mode(disable_tpm, long_opt)
+ logging.info(output_log)
# Check the result of TPM Mode.
if disable_tpm:
