faft: modify using ccd logic
Servo is going to have the capability to use servo micro and ccd with
the same device. A lot of tests check if servo is using ccd to determine
if the servo setup can press the power button. When servod uses servo
micro and ccd to run, servo micro is the default device. The test is
running through servo micro even if the servo type is
servo_v4_with_servo_micro_and_with_ccd_cr50, modify all running using
ccd checks, so it will check if the servo type is ccd_cr50 and not
servo_micro.
BUG=none
BRANCH=none
TEST=run firmware_Cr50BID firmware_Cr50DeepSleepStress
firmware_Cr50SetBoardId firmware_Cr50Testlab firmware_ECUsbPorts
firmware_ECWakeSource using servo_v4_with_servo_micro_and_with_ccd_cr50
Change-Id: I135739177f2a9841c395b15afcd490741a9442cd
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1707050
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
diff --git a/server/cros/servo/servo.py b/server/cros/servo/servo.py
index ec4622c..11012b5 100644
--- a/server/cros/servo/servo.py
+++ b/server/cros/servo/servo.py
@@ -853,6 +853,12 @@
return self._server.get_version()
+ def running_through_ccd(self):
+ """Returns True if the setup is using ccd to run."""
+ servo = self._server.get_version()
+ return 'ccd_cr50' in servo and 'servo_micro' not in servo
+
+
def _initialize_programmer(self, rw_only=False):
"""Initialize the firmware programmer.