support/testing: fix python syntax
Fix three issues with code style in our test infra: - 'print' is now a function, - exceptions need to be caught-assigned with the 'as' keyword, - old-style "%s"%() formatting is deprecated. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Ricardo Martincoski <ricardo.martincoski@gmail.com> [Thomas: drop indices in format strings.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
a1f4421cc7
commit
99723554c0
|
@ -34,17 +34,17 @@ def download(dldir, filename):
|
|||
os.makedirs(dldir)
|
||||
|
||||
tmpfile = tempfile.mktemp(dir=dldir)
|
||||
print "Downloading to {}".format(tmpfile)
|
||||
print("Downloading to {}".format(tmpfile))
|
||||
|
||||
try:
|
||||
url_fh = urlopen(os.path.join(ARTIFACTS_URL, filename))
|
||||
with open(tmpfile, "w+") as tmpfile_fh:
|
||||
tmpfile_fh.write(url_fh.read())
|
||||
except (HTTPError, URLError), err:
|
||||
except (HTTPError, URLError) as err:
|
||||
os.unlink(tmpfile)
|
||||
raise err
|
||||
|
||||
print "Renaming from %s to %s" % (tmpfile, finalpath)
|
||||
print("Renaming from {} to {}".format(tmpfile, finalpath))
|
||||
os.rename(tmpfile, finalpath)
|
||||
return finalpath
|
||||
|
||||
|
|
|
@ -46,8 +46,8 @@ class BRTest(unittest.TestCase):
|
|||
self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
|
||||
|
||||
def show_msg(self, msg):
|
||||
print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
|
||||
self.testname, msg)
|
||||
print("{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
|
||||
self.testname, msg))
|
||||
|
||||
def setUp(self):
|
||||
self.show_msg("Starting")
|
||||
|
|
|
@ -41,7 +41,7 @@ def main():
|
|||
BRTest.logtofile = False
|
||||
|
||||
if args.list:
|
||||
print "List of tests"
|
||||
print("List of tests")
|
||||
nose2.discover(argv=[script_path,
|
||||
"-s", test_dir,
|
||||
"-v",
|
||||
|
@ -52,16 +52,16 @@ def main():
|
|||
if args.download is None:
|
||||
args.download = os.getenv("BR2_DL_DIR")
|
||||
if args.download is None:
|
||||
print "Missing download directory, please use -d/--download"
|
||||
print ""
|
||||
print("Missing download directory, please use -d/--download")
|
||||
print("")
|
||||
parser.print_help()
|
||||
return 1
|
||||
|
||||
BRTest.downloaddir = os.path.abspath(args.download)
|
||||
|
||||
if args.output is None:
|
||||
print "Missing output directory, please use -o/--output"
|
||||
print ""
|
||||
print("Missing output directory, please use -o/--output")
|
||||
print("")
|
||||
parser.print_help()
|
||||
return 1
|
||||
|
||||
|
@ -71,8 +71,8 @@ def main():
|
|||
BRTest.outputdir = os.path.abspath(args.output)
|
||||
|
||||
if args.all is False and len(args.testname) == 0:
|
||||
print "No test selected"
|
||||
print ""
|
||||
print("No test selected")
|
||||
print("")
|
||||
parser.print_help()
|
||||
return 1
|
||||
|
||||
|
@ -80,8 +80,8 @@ def main():
|
|||
|
||||
if args.testcases != 1:
|
||||
if args.testcases < 1:
|
||||
print "Invalid number of testcases to run simultaneously"
|
||||
print ""
|
||||
print("Invalid number of testcases to run simultaneously")
|
||||
print("")
|
||||
parser.print_help()
|
||||
return 1
|
||||
# same default BR2_JLEVEL as package/Makefile.in
|
||||
|
@ -93,16 +93,16 @@ def main():
|
|||
|
||||
if args.jlevel:
|
||||
if args.jlevel < 0:
|
||||
print "Invalid BR2_JLEVEL to use for each testcase"
|
||||
print ""
|
||||
print("Invalid BR2_JLEVEL to use for each testcase")
|
||||
print("")
|
||||
parser.print_help()
|
||||
return 1
|
||||
# the user can override the auto calculated value
|
||||
BRTest.jlevel = args.jlevel
|
||||
|
||||
if args.timeout_multiplier < 1:
|
||||
print "Invalid multiplier for timeout values"
|
||||
print ""
|
||||
print("Invalid multiplier for timeout values")
|
||||
print("")
|
||||
parser.print_help()
|
||||
return 1
|
||||
BRTest.timeout_multiplier = args.timeout_multiplier
|
||||
|
|
Loading…
Reference in a new issue