cr50: search for something more specific than .*>
BUG=b:80201548
BRANCH=none
TEST=run firmware_Cr50OpenWhileAPOff firmware_Cr50RMAOpen
firmware_Cr50Testlab firmware_Cr50Open firmware_Cr50Update
Change-Id: I4ffc4806991fd17cf3bdd094817de52f5cfe70c0
Signed-off-by: Mary Ruthven <mruthven@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1074374
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Kevin Shelton <kmshelton@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
diff --git a/server/cros/servo/chrome_cr50.py b/server/cros/servo/chrome_cr50.py
index c65394b..a94ff22 100644
--- a/server/cros/servo/chrome_cr50.py
+++ b/server/cros/servo/chrome_cr50.py
@@ -305,7 +305,7 @@
def rolledback(self):
"""Returns true if cr50 just rolled back"""
return 'Rollback detected' in self.send_command_get_output('sysinfo',
- ['.*>'])[0]
+ ['sysinfo.*>'])[0]
def get_version_info(self, regexp):
@@ -497,7 +497,7 @@
# Set testlab mode
rv = self.send_command_get_output('ccd testlab %s' % request_str,
- ['.*>'])[0]
+ ['ccd.*>'])[0]
if 'Access Denied' in rv:
raise error.TestFail("'ccd %s' %s" % (request_str, rv))
@@ -552,7 +552,7 @@
"physical presence or testlab mode enabled")
# Start the unlock process.
- rv = self.send_command_get_output('ccd %s' % level, ['.*>'])[0]
+ rv = self.send_command_get_output('ccd %s' % level, ['ccd.*>'])[0]
logging.info(rv)
if 'Access Denied' in rv:
raise error.TestFail("'ccd %s' %s" % (level, rv))
diff --git a/server/site_tests/firmware_Cr50ConsoleCommands/firmware_Cr50ConsoleCommands.py b/server/site_tests/firmware_Cr50ConsoleCommands/firmware_Cr50ConsoleCommands.py
index 4b56100..6a31b57 100644
--- a/server/site_tests/firmware_Cr50ConsoleCommands/firmware_Cr50ConsoleCommands.py
+++ b/server/site_tests/firmware_Cr50ConsoleCommands/firmware_Cr50ConsoleCommands.py
@@ -28,15 +28,13 @@
# This information is in ec/board/cr50/scratch_reg1.h
RELEVANT_PROPERTIES = 0x63
BRDPROP_FORMAT = ['properties = (0x\d+)\s']
- HELP_FORMAT = [ 'Known commands:(.*)HELP LIST.*>']
- GENERAL_FORMAT = [ '\n(.*)>']
COMPARE_LINES = '\n'
COMPARE_WORDS = None
SORTED = True
TESTS = [
- ['pinmux', GENERAL_FORMAT, COMPARE_LINES, not SORTED],
- ['help', HELP_FORMAT, COMPARE_WORDS, SORTED],
- ['gpiocfg', GENERAL_FORMAT, COMPARE_LINES, not SORTED],
+ ['pinmux', 'pinmux(.*)>', COMPARE_LINES, not SORTED],
+ ['help', 'Known commands:(.*)HELP LIST.*>', COMPARE_WORDS, SORTED],
+ ['gpiocfg', 'gpiocfg(.*)>', COMPARE_LINES, not SORTED],
]
CCD_HOOK_WAIT = 2
# Lists connecting the board property values to the labels.
@@ -81,7 +79,7 @@
def get_output(self, cmd, regexp, split_str, sort):
"""Return the cr50 console output"""
- output = self.cr50.send_command_get_output(cmd, regexp)[0][1].strip()
+ output = self.cr50.send_command_get_output(cmd, [regexp])[0][1].strip()
logging.debug('%s output:%s\n', cmd, output)
# Record the original command output
diff --git a/server/site_tests/firmware_Cr50OpenWhileAPOff/firmware_Cr50OpenWhileAPOff.py b/server/site_tests/firmware_Cr50OpenWhileAPOff/firmware_Cr50OpenWhileAPOff.py
index 6ce52b2..2eb720f 100644
--- a/server/site_tests/firmware_Cr50OpenWhileAPOff/firmware_Cr50OpenWhileAPOff.py
+++ b/server/site_tests/firmware_Cr50OpenWhileAPOff/firmware_Cr50OpenWhileAPOff.py
@@ -106,7 +106,8 @@
# Verify the cr50 console responds to commands.
try:
- logging.info(self.cr50.send_command_get_output('ccdstate', ['.*>']))
+ logging.info(self.cr50.send_command_get_output('ccdstate',
+ ['ccdstate.*>']))
except error.TestFail, e:
if 'Timeout waiting for response' in e.message:
raise error.TestFail('Could not restore Cr50 console')
@@ -182,7 +183,7 @@
def send_ccd_cmd(self, state):
"""Send the cr50 command ccd command. Make sure access is denied"""
logging.info('running lockout check %s', state)
- rv = self.cr50.send_command_get_output('ccd %s' % state , ['.*>'])[0]
+ rv = self.cr50.send_command_get_output('ccd %s' % state , ['ccd.*>'])[0]
logging.info(rv)
if self.ccd_lockout != ('Access Denied' in rv):
raise error.TestFail('CCD is not %s' % ('locked out' if
diff --git a/server/site_tests/firmware_Cr50RMAOpen/firmware_Cr50RMAOpen.py b/server/site_tests/firmware_Cr50RMAOpen/firmware_Cr50RMAOpen.py
index e79cd68..aecb64b 100644
--- a/server/site_tests/firmware_Cr50RMAOpen/firmware_Cr50RMAOpen.py
+++ b/server/site_tests/firmware_Cr50RMAOpen/firmware_Cr50RMAOpen.py
@@ -231,7 +231,7 @@
# disable
if not unsupported_key:
logging.info(self.cr50.send_command_get_output('wp enable',
- ['.*>']))
+ ['wp.*>']))
# Run RMA disable to reset the capabilities.
self.rma_ap(disable=True, expected_exit_status=exit_status)
diff --git a/server/site_tests/firmware_Cr50Testlab/firmware_Cr50Testlab.py b/server/site_tests/firmware_Cr50Testlab/firmware_Cr50Testlab.py
index 3e91793..7c092e2 100644
--- a/server/site_tests/firmware_Cr50Testlab/firmware_Cr50Testlab.py
+++ b/server/site_tests/firmware_Cr50Testlab/firmware_Cr50Testlab.py
@@ -46,7 +46,7 @@
"""
logging.info('Setting ccd testlab %s', mode)
rv = self.cr50.send_command_get_output('ccd testlab %s' % mode,
- ['.*>'])[0]
+ ['ccd.*>'])[0]
logging.info(rv)
if err not in rv or (not err and self.BASIC_ERROR in rv):
raise error.TestFail('Unexpected result setting "%s": %r' % (mode,