Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-17 17:43:06 -05:00
Code Issues Projects Releases Wiki Activity

tests: Clean up output formatting with str.format()

Browse Source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-11-02 17:07:13 +02:00
parent 65015b2d8e
commit f5f59e4f57
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/hwsim/run-tests.py
View File

@ -297,7 +297,7 @@ def main():
try: try:
d.request("NOTE TEST-STOP " + name) d.request("NOTE TEST-STOP " + name)
except Exception, e: except Exception, e:
logger.info("Failed to issue TEST-STOP after " + name + " for " + d.ifname) logger.info("Failed to issue TEST-STOP after {} for {}".format(name, d.ifname))
logger.info(e) logger.info(e)
reset_devs(dev, apdev) reset_devs(dev, apdev)
@ -310,8 +310,7 @@ def main():
end = datetime.now() end = datetime.now()
diff = end - start diff = end - start
report(conn, args.prefill, args.build, args.commit, run, name, result, diff.total_seconds()) report(conn, args.prefill, args.build, args.commit, run, name, result, diff.total_seconds())
result = result + " " + name + " " result = "{} {} {} {}".format(result, name, diff.total_seconds(), end)
result = result + str(diff.total_seconds()) + " " + str(end)
logger.info(result) logger.info(result)
if args.loglevel == logging.WARNING: if args.loglevel == logging.WARNING:
print result print result
@ -330,19 +329,19 @@ def main():
conn.close() conn.close()
if len(failed): if len(failed):
logger.info("passed " + str(len(passed)) + " test case(s)") logger.info("passed {} test case(s)".format(len(passed)))
logger.info("skipped " + str(len(skipped)) + " test case(s)") logger.info("skipped {} test case(s)".format(len(skipped)))
logger.info("failed tests: " + str(failed)) logger.info("failed tests: " + str(failed))
if args.loglevel == logging.WARNING: if args.loglevel == logging.WARNING:
print "failed tests: " + str(failed) print "failed tests: " + str(failed)
sys.exit(1) sys.exit(1)
logger.info("passed all " + str(len(passed)) + " test case(s)") logger.info("passed all {} test case(s)".format(len(passed)))
if len(skipped): if len(skipped):
logger.info("skipped " + str(len(skipped)) + " test case(s)") logger.info("skipped {} test case(s)".format(len(skipped)))
if args.loglevel == logging.WARNING: if args.loglevel == logging.WARNING:
print "passed all " + str(len(passed)) + " test case(s)" print "passed all {} test case(s)".format(len(passed))
if len(skipped): if len(skipped):
print "skipped " + str(len(skipped)) + " test case(s)" print "skipped {} test case(s)".format(len(skipped))
if __name__ == "__main__": if __name__ == "__main__":
main() main()