Skip to content

P
Production Test Suite
Commit b0b12219 authored by Juan David González Cobas's avatar Juan David González Cobas
Browse files
Options

tps: get all params from command-line

parent 8a7a2fa0
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 29 deletions
tps.py
View file @ b0b12219
...@@ -14,8 +14,10 @@ from hashlib import sha1 as sha160 ...@@ -14,8 +14,10 @@ from hashlib import sha1 as sha160
from tpsexcept import * from tpsexcept import *
from pprint import pprint from pprint import pprint
default_config_file = 'default.cfg' default_config_file = 'tpsdefault.cfg'
default_log_pattern = 'test_%(board)s_%(serial)s_%(number)s_%(timestamp)s.txt' default_log_pattern = 'tps_%(board)s_%(serial)s_%(number)s_%(timestamp)s.txt'
default_log_name = 'tps_run_{0}_{1}_{2}_{3}.txt'
default_test_pattern = 'test[0-9][0-9]'
def run_test(testname, logname): def run_test(testname, logname):
"""run test testname with output redirected to logname """run test testname with output redirected to logname
...@@ -57,12 +59,12 @@ class Suite(object): ...@@ -57,12 +59,12 @@ class Suite(object):
raise TpsCritical(errmsg) raise TpsCritical(errmsg)
config = ConfigParser(cfg) config = ConfigParser(cfg)
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.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.log_name = config.get('global', 'log_name') self.log_name = config.get('global', 'log_name')
self.log_pattern = config.get('global', 'log_pattern') self.log_pattern = config.get('global', 'log_pattern')
def write_config(self): def write_config(self):
config = ConfigParser() config = ConfigParser()
...@@ -71,9 +73,9 @@ class Suite(object): ...@@ -71,9 +73,9 @@ class Suite(object):
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', 'test_path', self.path) config.set('global', 'test_path', self.test_path)
config.set('global', 'log_path', self.logpath) config.set('global', 'log_path', self.log_path)
config.set('global', 'log_name', self.pattern) config.set('global', 'log_name', self.log_name)
config.set('global', 'log_pattern', self.log_pattern) config.set('global', 'log_pattern', self.log_pattern)
# Writing our configuration file # Writing our configuration file
...@@ -82,19 +84,23 @@ class Suite(object): ...@@ -82,19 +84,23 @@ class Suite(object):
def run(self): def run(self):
ts = timestamp() ts = timestamp()
if not self.serial: missing = self.missing()
serial = get_serial() if missing:
else: print 'cannot run with missing parameters,',
serial = self.serial print 'please supply:',
runid = sha(self.board + ':' + serial + ':' + ts) for f in missing:
logfilename = self.log.format(self.board, serial, ts, runid) print f,
logfilename = os.path.join(self.logpath, logfilename) print
return
runid = sha(self.board + ':' + self.serial + ':' + ts)
logfilename = self.log_name.format(self.board, self.serial, ts, runid)
logfilename = os.path.join(self.log_path, logfilename)
log = file(logfilename, 'wb') log = file(logfilename, 'wb')
test_glob = os.path.join(self.path, self.pattern + '.py') test_glob = os.path.join(self.test_path, default_test_pattern + '.py')
sequence = glob.glob(test_glob) sequence = glob.glob(test_glob)
if self.path not in sys.path: if self.test_path not in sys.path:
sys.path.append(self.path) sys.path.append(self.test_path)
log.write('test run\n' log.write('test run\n'
' board = {0}\n' ' board = {0}\n'
...@@ -106,8 +112,10 @@ class Suite(object): ...@@ -106,8 +112,10 @@ class Suite(object):
try: try:
testname = os.path.splitext(os.path.basename(test))[0] testname = os.path.splitext(os.path.basename(test))[0]
shortname= re.match('test(\d\d)', testname).group(1) shortname= re.match('test(\d\d)', testname).group(1)
logname = self.log_pattern % dict(serial=serial, timestamp=ts, test=testname) logname = self.log_pattern % dict(board=self.board,
logname = os.path.join(self.logpath, logname) serial=self.serial, timestamp=ts,
number=shortname)
logname = os.path.join(self.log_path, logname)
log.write('------------------------\n') log.write('------------------------\n')
log.write('running test {0} = {1}\n'.format(shortname, test)) log.write('running test {0} = {1}\n'.format(shortname, test))
run_test(testname, logname) run_test(testname, logname)
...@@ -218,17 +226,28 @@ class Cli(cmd.Cmd, Suite): ...@@ -218,17 +226,28 @@ class Cli(cmd.Cmd, Suite):
def main1(): def main1():
parser = OptionParser() parser = OptionParser()
parser.add_option("-c", "--config", dest="config", parser.add_option("-c", "--config", dest="config",
default=default_config_file, default="tpsdefault.cfg",
help="config file name", metavar="FILE") help="config file name")
parser.add_option("--cli", dest="cli", action="store_true",
help="enter command-line interpreter")
parser.add_option("-b", "--board", dest="board",
help="board name (e.g. -b SPEC)", metavar="NAME")
parser.add_option("-s", "--serial", dest="serial", parser.add_option("-s", "--serial", dest="serial",
default='000000', help="board serial number", metavar="SERIAL")
help="board serial number", metavar="FILE") parser.add_option("-t", "--test-path", dest="test_path",
help="path to test files", metavar="PATH")
parser.add_option("-l", "--log-path", dest="log_path",
help="path to log files", metavar="PATH")
parser.add_option("-o", "--log-name", dest="log_name",
help="main log file pattern")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
s = Suite(options.config) s = Suite(options.config)
if options.serial: s.__dict__.update(options.__dict__)
s.serial = options.serial s.sequence = args
s.log_name = default_log_name
s.write_config() s.write_config()
s.run() s.run()
......
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