commit 80bae85068c1b1e41657df119a7d1944c8c53ab8
author Mary Ruthven <mruthven@chromium.org> Fri Jan 17 13:21:39 2020 -0800
committer Mary Ruthven <mruthven@chromium.org> Tue Jan 21 19:45:31 2020 +0000
tree b049c7841078340d5efc044a87b3b35478de346f
parent e2f32f374b514717e1925b54fa8d7a51064ec8df

faft-cr50: update expected sysinfo key ladder output for 4.24

The key ladder state is now dev, prod, or disabled. Dev and prod are
both 'enabled'.

BUG=none
TEST=run faft_cr50_tot

Change-Id: I4c26a8c3720a75fb85fe08d5692dcdd9fcf15d0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2008448
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Dana Goyette <dgoyette@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>

server/cros/servo/chrome_cr50.py

diff --git a/server/cros/servo/chrome_cr50.py b/server/cros/servo/chrome_cr50.py
index 78f766a..f31b1a2 100644
--- a/server/cros/servo/chrome_cr50.py
+++ b/server/cros/servo/chrome_cr50.py
@@ -955,16 +955,24 @@
         return result.lower() == 'enabled'
 
 
-    def keyladder_is_enabled(self):
+    def get_keyladder_state(self):
         """Get the status of H1 Key Ladder.
 
-        @return: True if H1 Key Ladder is enabled. False otherwise.
+        @return: The keyladder state string. prod or dev both mean enabled.
         """
         result = self.send_command_retry_get_output('sysinfo',
-                ['(?i)Key\s+Ladder:\s+(enabled|disabled)'], safe=True)[0][1]
+                ['(?i)Key\s+Ladder:\s+(enabled|prod|dev|disabled)'],
+                safe=True)[0][1]
         logging.debug(result)
+        return result
 
-        return result.lower() == 'enabled'
+
+    def keyladder_is_disabled(self):
+        """Get the status of H1 Key Ladder.
+
+        @return: True if H1 Key Ladder is disabled. False otherwise.
+        """
+        return self.get_keyladder_state() == 'disabled'
 
 
     def get_sleepmask(self):

server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py

diff --git a/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py b/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py
index 507bf5c..11a8e48 100644
--- a/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py
+++ b/server/site_tests/firmware_Cr50TpmMode/firmware_Cr50TpmMode.py
@@ -82,7 +82,7 @@
             raise error.TestFail('TPM is not enabled after reset,')
 
         # Check if Key Ladder is enabled.
-        if not self.cr50.keyladder_is_enabled():
+        if self.cr50.keyladder_is_disabled():
             raise error.TestFail('Failed to restore H1 Key Ladder')
 
         # Check if TPM is enabled through gsctool.
@@ -126,7 +126,7 @@
             else:
                 logging.info('TPM did not respond')
 
-            if self.cr50.keyladder_is_enabled():
+            if not self.cr50.keyladder_is_disabled():
                 raise error.TestFail('Failed to revoke H1 Key Ladder')
         else:
             if not 'enabled (1)' in output_log.lower():