From 40e7d5799936cdfc079a0c7c21d277ad61696984 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 9 Mar 2018 14:03:29 +0000 Subject: [PATCH] selftest: convert print func to be py2/py3 compatible Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- selftest/selftesthelpers.py | 21 +++++++++++---------- selftest/subunithelper.py | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 8b885b59419..0d8014c7d13 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -17,6 +17,7 @@ # by the name of the test, the environment it needs and the command to run, all # three separated by newlines. All other lines in the output are considered # comments. +from __future__ import print_function import os import subprocess @@ -66,18 +67,18 @@ def plantestsuite(name, env, cmdline): :param env: Environment to run the testsuite in :param cmdline: Command line to run """ - print "-- TEST --" + print("-- TEST --") if env == "none": fullname = name else: fullname = "%s(%s)" % (name, env) - print fullname - print env + print(fullname) + print(env) if isinstance(cmdline, list): cmdline = " ".join(cmdline) if "$LISTOPT" in cmdline: raise AssertionError("test %s supports --list, but not --load-list" % name) - print cmdline + " 2>&1 " + " | " + add_prefix(name, env) + print(cmdline + " 2>&1 " + " | " + add_prefix(name, env)) def add_prefix(prefix, env, support_list=False): @@ -89,13 +90,13 @@ def add_prefix(prefix, env, support_list=False): def plantestsuite_loadlist(name, env, cmdline): - print "-- TEST-LOADLIST --" + print("-- TEST-LOADLIST --") if env == "none": fullname = name else: fullname = "%s(%s)" % (name, env) - print fullname - print env + print(fullname) + print(env) if isinstance(cmdline, list): cmdline = " ".join(cmdline) support_list = ("$LISTOPT" in cmdline) @@ -103,8 +104,8 @@ def plantestsuite_loadlist(name, env, cmdline): raise AssertionError("loadlist test %s does not support not --list" % name) if not "$LOADLIST" in cmdline: raise AssertionError("loadlist test %s does not support --load-list" % name) - print ("%s | %s" % (cmdline.replace("$LOADLIST", ""), add_prefix(name, env, support_list))).replace("$LISTOPT", "--list") - print cmdline.replace("$LISTOPT", "") + " 2>&1 " + " | " + add_prefix(name, env, False) + print(("%s | %s" % (cmdline.replace("$LOADLIST", ""), add_prefix(name, env, support_list))).replace("$LISTOPT", "--list")) + print(cmdline.replace("$LISTOPT", "") + " 2>&1 " + " | " + add_prefix(name, env, False)) def skiptestsuite(name, reason): @@ -114,7 +115,7 @@ def skiptestsuite(name, reason): :param reason: Reason the test suite was skipped """ # FIXME: Report this using subunit, but re-adjust the testsuite count somehow - print >>sys.stderr, "skipping %s (%s)" % (name, reason) + print("skipping %s (%s)" % (name, reason), file=sys.stderr) def planperltestsuite(name, path): diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index bcd25ffc8b5..9755f926d4f 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function __all__ = ['parse_results'] import datetime @@ -65,7 +66,7 @@ def parse_results(msg_ops, statistics, fh): try: dt = iso8601.parse_date(arg.rstrip("\n")) except TypeError as e: - print "Unable to parse time line: %s" % arg.rstrip("\n") + print("Unable to parse time line: %s" % arg.rstrip("\n")) else: msg_ops.time(dt) elif command in VALID_RESULTS: @@ -600,7 +601,7 @@ class PlainFormatter(TestsuiteEnabledTestResult): unexpected = False if not name in self.test_output: - print "no output for name[%s]" % name + print("no output for name[%s]" % name) if result in ("success", "xfail"): self.suites_ok+=1 @@ -686,11 +687,11 @@ class PlainFormatter(TestsuiteEnabledTestResult): if not self.immediate and not self.verbose: for suite in self.suitesfailed: - print "=" * 78 - print "FAIL: %s" % suite + print("=" * 78) + print("FAIL: %s" % suite) if suite in self.test_output: - print self.test_output[suite] - print "" + print(self.test_output[suite]) + print("") f.write("= Skipped tests =\n") for reason in self.skips.keys(): @@ -706,13 +707,13 @@ class PlainFormatter(TestsuiteEnabledTestResult): not self.statistics['TESTS_ERROR']): ok = (self.statistics['TESTS_EXPECTED_OK'] + self.statistics['TESTS_EXPECTED_FAIL']) - print "\nALL OK (%d tests in %d testsuites)" % (ok, self.suites_ok) + print("\nALL OK (%d tests in %d testsuites)" % (ok, self.suites_ok)) else: - print "\nFAILED (%d failures, %d errors and %d unexpected successes in %d testsuites)" % ( + print("\nFAILED (%d failures, %d errors and %d unexpected successes in %d testsuites)" % ( self.statistics['TESTS_UNEXPECTED_FAIL'], self.statistics['TESTS_ERROR'], self.statistics['TESTS_UNEXPECTED_OK'], - len(self.suitesfailed)) + len(self.suitesfailed))) def skip_testsuite(self, name, reason="UNKNOWN"): self.skips.setdefault(reason, []).append(name) -- 2.34.1