From 8f946511c90dbca5636e709977555e5e48711605 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 30 Oct 2013 22:53:29 +0100 Subject: [PATCH] hwsim tests: Reset at the end of a test Resetting at the beginning causes the reset logging/tracing data to leak from the previous test into the next, and the last one being missed at all - reset at the end of each run instead. Also reset before all tests just in case running a test actually crashed the python script. Signed-hostap: Johannes Berg --- tests/hwsim/run-tests.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py index fd2220b5a..5a2655874 100755 --- a/tests/hwsim/run-tests.py +++ b/tests/hwsim/run-tests.py @@ -200,6 +200,10 @@ def main(): skipped = [] failed = [] + # make sure nothing is left over from previous runs + # (if there were any other manual runs or we crashed) + reset_devs(dev, apdev) + if args.dmesg: subprocess.call(['sudo', 'dmesg', '-c'], stdout=open('/dev/null', 'w')) @@ -211,7 +215,6 @@ def main(): if not t.__module__ in args.testmodules: continue with DataCollector(args.logdir, t.__name__, args.tracing, args.dmesg): - reset_devs(dev, apdev) logger.info("START " + t.__name__) if log_to_file: print "START " + t.__name__ @@ -275,9 +278,7 @@ def main(): except Exception, e: logger.info("Failed to issue TEST-STOP after " + t.__name__ + " for " + d.ifname) logger.info(e) - - if not args.tests: - reset_devs(dev, apdev) + reset_devs(dev, apdev) if conn: conn.close()