@@ -201,6 +201,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(['dmesg', '-c'], stdout=open('/dev/null', 'w'))
@@ -212,7 +216,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__
@@ -276,9 +279,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()