Skip to content

P
Production Test Suite
Commit a65556b6 authored by Samuel Iglesias Gonsalvez's avatar Samuel Iglesias Gonsalvez
Browse files
Options

tps: added an extra serial number

parent 5f299666
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 7 deletions
tps.py
View file @ a65556b6
...@@ -67,7 +67,7 @@ def run_test(testname, logname, yes=False): ...@@ -67,7 +67,7 @@ def run_test(testname, logname, yes=False):
class Suite(object): class Suite(object):
def __init__(self, cfgfilename=default_config_file): def __init__(self, cfgfilename=default_config_file):
self.required = [ 'board', 'serial', 'test_path', self.required = [ 'board', 'serial', 'extra_serial', 'test_path',
'log_path', 'sequence' ] 'log_path', 'sequence' ]
for fieldname in self.required: for fieldname in self.required:
self.__setattr__(fieldname, None) self.__setattr__(fieldname, None)
...@@ -98,6 +98,7 @@ class Suite(object): ...@@ -98,6 +98,7 @@ class Suite(object):
try: try:
self.board = config.get('global', 'board') self.board = config.get('global', 'board')
self.serial = config.get('global', 'serial') self.serial = config.get('global', 'serial')
self.extra_serial = config.get('global', 'extra_serial')
self.test_path = config.get('global', 'test_path') self.test_path = config.get('global', 'test_path')
self.log_path = config.get('global', 'log_path') self.log_path = config.get('global', 'log_path')
self.sequence = config.get('global', 'sequence') self.sequence = config.get('global', 'sequence')
...@@ -112,6 +113,7 @@ class Suite(object): ...@@ -112,6 +113,7 @@ class Suite(object):
config.add_section('global') config.add_section('global')
config.set('global', 'board', self.board) config.set('global', 'board', self.board)
config.set('global', 'serial', self.serial) config.set('global', 'serial', self.serial)
config.set('global', 'extra_serial', self.extra_serial)
config.set('global', 'test_path', self.test_path) config.set('global', 'test_path', self.test_path)
config.set('global', 'log_path', self.log_path) config.set('global', 'log_path', self.log_path)
config.set('global', 'sequence', self.sequence) config.set('global', 'sequence', self.sequence)
...@@ -133,6 +135,10 @@ class Suite(object): ...@@ -133,6 +135,10 @@ class Suite(object):
msg = 'invalid serial number [{0}]'.format(self.serial) msg = 'invalid serial number [{0}]'.format(self.serial)
raise TpsInvalid(msg) raise TpsInvalid(msg)
self.serial = self.serial.strip(',') self.serial = self.serial.strip(',')
if not self.extra_serial:
msg = 'invalid optional serial number [{0}]'.format(self.extra_serial)
raise TpsInvalid(msg)
self.extra_serial = self.extra_serial.strip(',')
warnings.simplefilter('error') warnings.simplefilter('error')
try: try:
...@@ -203,11 +209,12 @@ class Suite(object): ...@@ -203,11 +209,12 @@ class Suite(object):
sys.path.append(self.test_path) sys.path.append(self.test_path)
log.write('test run\n' log.write('test run\n'
' board = {0}\n' ' board = {0}\n'
' serial = {1}\n' ' serial = {1}\n'
' timestamp = {2}\n' ' optional serial = {2}\n'
' runid = {3}\n'.format( ' timestamp = {3}\n'
self.board, self.serial, ts, runid)) ' runid = {4}\n'.format(
self.board, self.serial, self.extra_serial, ts, runid))
failures = [] failures = []
for test in sequence: for test in sequence:
try: try:
...@@ -280,6 +287,11 @@ def get_serial(): ...@@ -280,6 +287,11 @@ def get_serial():
""" """
return raw_input('board serial number? ').strip() return raw_input('board serial number? ').strip()
def get_extra_serial():
"""return serial number of current board to test
"""
return raw_input('board serial number? ').strip()
def timestamp(): def timestamp():
"""timestamp for now """timestamp for now
""" """
...@@ -315,6 +327,13 @@ class Cli(cmd.Cmd, Suite): ...@@ -315,6 +327,13 @@ class Cli(cmd.Cmd, Suite):
else: else:
print self.serial print self.serial
def do_extra_serial(self, arg):
if arg:
self.extra_serial = arg
else:
print self.extra_serial
def do_test_path(self, arg): def do_test_path(self, arg):
if arg: if arg:
self.test_path = arg self.test_path = arg
...@@ -356,6 +375,7 @@ class Cli(cmd.Cmd, Suite): ...@@ -356,6 +375,7 @@ class Cli(cmd.Cmd, Suite):
params_to_list = ( params_to_list = (
'board', 'board',
'serial', 'serial',
'extra_serial',
'test_path', 'test_path',
'log_path', 'log_path',
'repeat', 'repeat',
...@@ -396,6 +416,8 @@ def main(): ...@@ -396,6 +416,8 @@ def main():
help="board name (e.g. -b SPEC)", metavar="NAME") help="board name (e.g. -b SPEC)", metavar="NAME")
parser.add_option("-s", "--serial", dest="serial", parser.add_option("-s", "--serial", dest="serial",
help="board serial number", metavar="SERIAL") help="board serial number", metavar="SERIAL")
parser.add_option("-e", "--extra_serial", dest="extra_serial",
help="another board serial number [Optional]", metavar="SERIAL")
parser.add_option("-t", "--test-path", dest="test_path", parser.add_option("-t", "--test-path", dest="test_path",
help="path to test files", metavar="PATH") help="path to test files", metavar="PATH")
parser.add_option("-l", "--log-path", dest="log_path", parser.add_option("-l", "--log-path", dest="log_path",
......
tps.sh
View file @ a65556b6
...@@ -8,5 +8,12 @@ if [ x$1 = x"" ]; then ...@@ -8,5 +8,12 @@ if [ x$1 = x"" ]; then
read serial read serial
fi fi
time ./tps.py -b SPEC -s $serial -t./test/spec/python -l /tmp 00 01 02 03 05 06 07 08 extra_serial=$1
if [ x$2 = x"" ]; then
echo -n "Please, input extra SERIAL number [optional]: "
read extra_serial
fi
time ./tps.py -b SPEC -s $serial -e $extra_serial -t./test/spec/python -l /tmp 00 01 02 03 05 06 07 08
tpsdefault.cfg
View file @ a65556b6
[global] [global]
board = SPEC board = SPEC
serial = 000000 serial = 000000
extra-serial = 000000
test_path = tests/ test_path = tests/
log_path = logs/ log_path = logs/
sequence = ['00', '02', '03'] sequence = ['00', '02', '03']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment