DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Always write run-tests.py debug logs a file

Browse source 
Remove the -l command like option from run-tests.py and always enable
writing of debug level logs to files. The stdout debug verbosity is
controlled independently of the debug log files.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-11-02 12:20:59 +02:00
parent 75428961d9
commit 8f47f31dd8
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/hwsim/run-all.sh
View file

@ -66,7 +66,7 @@ if ! ./start.sh $CONCURRENT $VALGRIND $TRACE; then
exit 1
fi
./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -l $DB $CONCURRENT_TESTS $@ || errors=1
./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -q $DB $CONCURRENT_TESTS $@ || errors=1
./stop-wifi.sh

28
tests/hwsim/run-tests.py
View file

@ -93,7 +93,6 @@ def main():
test_names = list(set([t.__name__.replace('test_', '', 1) for t in tests]))
run = None
print_res = False
parser = argparse.ArgumentParser(description='hwsim test runner')
parser.add_argument('--logdir', metavar='<directory>',
@ -105,8 +104,6 @@ def main():
help="verbose debug output")
group.add_argument('-q', const=logging.WARNING, action='store_const',
dest='loglevel', help="be quiet")
group.add_argument('-l', action='store_true', dest='logfile',
help='store debug log to a file (in log directory)')
parser.add_argument('-S', metavar='<sqlite3 db>', dest='database',
help='database to write results to')
@ -143,21 +140,20 @@ def main():
else:
args.logdir = 'logs'
if args.logfile:
# Write debug level log to a file and configurable verbosity to stdout
logger.setLevel(logging.DEBUG)
stdout_handler = logging.StreamHandler()
stdout_handler.setLevel(args.loglevel)
logger.addHandler(stdout_handler)
file_name = os.path.join(args.logdir, 'run-tests.log')
log_handler = logging.FileHandler(file_name)
log_handler.setLevel(logging.DEBUG)
fmt = "%(asctime)s %(levelname)s %(message)s"
log_formatter = logging.Formatter(fmt)
log_handler.setFormatter(log_formatter)
logger.addHandler(log_handler)
log_to_file = True
else:
logging.basicConfig(level=args.loglevel)
log_handler = None
log_to_file = False
if args.loglevel == logging.WARNING:
print_res = True
if args.database:
import sqlite3
@ -242,12 +238,13 @@ def main():
logger.removeHandler(log_handler)
file_name = os.path.join(args.logdir, name + '.log')
log_handler = logging.FileHandler(file_name)
log_handler.setLevel(logging.DEBUG)
log_handler.setFormatter(log_formatter)
logger.addHandler(log_handler)
with DataCollector(args.logdir, name, args.tracing, args.dmesg):
logger.info("START " + name)
if log_to_file:
if args.loglevel == logging.WARNING:
print "START " + name
sys.stdout.flush()
if t.__doc__:
@ -327,7 +324,7 @@ def main():
result = result + " " + name + " "
result = result + str(diff.total_seconds()) + " " + str(end)
logger.info(result)
if log_to_file or print_res:
if args.loglevel == logging.WARNING:
print result
sys.stdout.flush()
@ -336,6 +333,7 @@ def main():
logger.removeHandler(log_handler)
file_name = os.path.join(args.logdir, 'run-tests.log')
log_handler = logging.FileHandler(file_name)
log_handler.setLevel(logging.DEBUG)
log_handler.setFormatter(log_formatter)
logger.addHandler(log_handler)
@ -346,11 +344,13 @@ def main():
logger.info("passed " + str(len(passed)) + " test case(s)")
logger.info("skipped " + str(len(skipped)) + " test case(s)")
logger.info("failed tests: " + str(failed))
if args.loglevel == logging.WARNING:
print "failed tests: " + str(failed)
sys.exit(1)
logger.info("passed all " + str(len(passed)) + " test case(s)")
if len(skipped):
logger.info("skipped " + str(len(skipped)) + " test case(s)")
if log_to_file:
if args.loglevel == logging.WARNING:
print "passed all " + str(len(passed)) + " test case(s)"
if len(skipped):
print "skipped " + str(len(skipped)) + " test case(s)"