servo: redirect servod --sversion to stdout
The code here is parsing stderr, so that was fine. However all stderr
over the ssh connection is redirected to logging.error, this was causing
error log spam.
BUG=None
TEST=test_that firmware_FAFTSetup --args 'servo_host=10.0.0.69'
Change-Id: Idce02e7c7d08f79a5d2684f10cb417dea58742f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2504438
Reviewed-by: Greg Edelston <gredelston@google.com>
Commit-Queue: Evan Benn <evanbenn@chromium.org>
Tested-by: Evan Benn <evanbenn@chromium.org>
diff --git a/server/cros/servo/servo.py b/server/cros/servo/servo.py
index a7e2026..08e6347 100644
--- a/server/cros/servo/servo.py
+++ b/server/cros/servo/servo.py
@@ -678,11 +678,11 @@
"""Returns the servod version."""
# TODO: use system_output once servod --sversion prints to stdout
try:
- result = self._servo_host.run('servod --sversion')
+ result = self._servo_host.run('servod --sversion 2>&1')
except error.AutoservRunError as e:
if 'command execution error' in str(e):
# Fall back to version if sversion is not supported yet.
- result = self._servo_host.run('servod --version')
+ result = self._servo_host.run('servod --version 2>&1')
return result.stdout.strip() or result.stderr.strip()
# An actually unexpected error occurred, just raise.
raise e
