tests: Fix regression in START line total count

The previous changes to enable stdin control broke the previous case of
showing the total number of test cases in the START lines. Fix that by
using a separate variable for the total number of test casess instead of
using length of the list of remaining test cases.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-11-19 22:02:08 +02:00
parent 41aa4bd739
commit f6d1c5d9f8

View File

@ -344,8 +344,9 @@ def main():
if args.stdin_ctrl: if args.stdin_ctrl:
print "READY" print "READY"
sys.stdout.flush() sys.stdout.flush()
num_tests = 0
else: else:
remaining_tests = tests_to_run num_tests = len(tests_to_run)
while True: while True:
if args.stdin_ctrl: if args.stdin_ctrl:
test = sys.stdin.readline() test = sys.stdin.readline()
@ -365,9 +366,9 @@ def main():
sys.stdout.flush() sys.stdout.flush()
continue continue
else: else:
if len(remaining_tests) == 0: if len(tests_to_run) == 0:
break break
t = remaining_tests.pop(0) t = tests_to_run.pop(0)
name = t.__name__.replace('test_', '', 1) name = t.__name__.replace('test_', '', 1)
if log_handler: if log_handler:
@ -382,7 +383,7 @@ def main():
reset_ok = True reset_ok = True
with DataCollector(args.logdir, name, args.tracing, args.dmesg): with DataCollector(args.logdir, name, args.tracing, args.dmesg):
count = count + 1 count = count + 1
msg = "START {} {}/{}".format(name, count, len(tests_to_run)) msg = "START {} {}/{}".format(name, count, num_tests)
logger.info(msg) logger.info(msg)
if args.loglevel == logging.WARNING: if args.loglevel == logging.WARNING:
print msg print msg