faft: move getting the servod version to servo.py
servod --version prints to stderr not stdout, so firmware_test aren't
getting the servod version right now, because it's uing stdout. Use
stderr if stdout is empty and move getting servod version to servo.py.
BUG=none
BRANCH=none
TEST=run a firmware test on a labstation device and locally. Make sure
servo_version is no longer empty.
Change-Id: I0952085ffcbf77db359b75e9982db4612037e11d
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1680978
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 da4b2c0..45df8be 100644
--- a/server/cros/servo/servo.py
+++ b/server/cros/servo/servo.py
@@ -351,6 +351,14 @@
lsb_release_content=lsb_release_content)
+ def get_servod_version(self):
+ """Returns the servod version."""
+ result = self._servo_host.run('servod --version')
+ # TODO: use system_output once servod --version prints to stdout
+ stdout = result.stdout.strip()
+ return stdout if stdout else result.stderr.strip()
+
+
def power_long_press(self):
"""Simulate a long power button press."""
# After a long power press, the EC may ignore the next power