test: use print() function on both Python 2 and 3

PR-URL: https://github.com/nodejs/node/pull/24485
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
cclauss 2018-11-19 11:53:08 +01:00 committed by Refael Ackermann
parent 35b996d6e8
commit 5f25dd1e2e
2 changed files with 24 additions and 22 deletions

View File

@ -1,3 +1,4 @@
from __future__ import print_function
# Copyright 2008 the V8 project authors. All rights reserved. # Copyright 2008 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
@ -67,22 +68,22 @@ class MessageTestCase(test.TestCase):
raw_lines = (output.stdout + output.stderr).split('\n') raw_lines = (output.stdout + output.stderr).split('\n')
outlines = [ s for s in raw_lines if not self.IgnoreLine(s) ] outlines = [ s for s in raw_lines if not self.IgnoreLine(s) ]
if len(outlines) != len(patterns): if len(outlines) != len(patterns):
print "length differs." print("length differs.")
print "expect=%d" % len(patterns) print("expect=%d" % len(patterns))
print "actual=%d" % len(outlines) print("actual=%d" % len(outlines))
print "patterns:" print("patterns:")
for i in xrange(len(patterns)): for i in xrange(len(patterns)):
print "pattern = %s" % patterns[i] print("pattern = %s" % patterns[i])
print "outlines:" print("outlines:")
for i in xrange(len(outlines)): for i in xrange(len(outlines)):
print "outline = %s" % outlines[i] print("outline = %s" % outlines[i])
return True return True
for i in xrange(len(patterns)): for i in xrange(len(patterns)):
if not re.match(patterns[i], outlines[i]): if not re.match(patterns[i], outlines[i]):
print "match failed" print("match failed")
print "line=%d" % i print("line=%d" % i)
print "expect=%s" % patterns[i] print("expect=%s" % patterns[i])
print "actual=%s" % outlines[i] print("actual=%s" % outlines[i])
return True return True
return False return False

View File

@ -1,3 +1,4 @@
from __future__ import print_function
# Copyright 2008 the V8 project authors. All rights reserved. # Copyright 2008 the V8 project authors. All rights reserved.
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
@ -65,22 +66,22 @@ class TTYTestCase(test.TestCase):
raw_lines = (output.stdout + output.stderr).split('\n') raw_lines = (output.stdout + output.stderr).split('\n')
outlines = [ s.strip() for s in raw_lines if not self.IgnoreLine(s) ] outlines = [ s.strip() for s in raw_lines if not self.IgnoreLine(s) ]
if len(outlines) != len(patterns): if len(outlines) != len(patterns):
print "length differs." print("length differs.")
print "expect=%d" % len(patterns) print("expect=%d" % len(patterns))
print "actual=%d" % len(outlines) print("actual=%d" % len(outlines))
print "patterns:" print("patterns:")
for i in xrange(len(patterns)): for i in xrange(len(patterns)):
print "pattern = %s" % patterns[i] print("pattern = %s" % patterns[i])
print "outlines:" print("outlines:")
for i in xrange(len(outlines)): for i in xrange(len(outlines)):
print "outline = %s" % outlines[i] print("outline = %s" % outlines[i])
return True return True
for i in xrange(len(patterns)): for i in xrange(len(patterns)):
if not re.match(patterns[i], outlines[i]): if not re.match(patterns[i], outlines[i]):
print "match failed" print("match failed")
print "line=%d" % i print("line=%d" % i)
print "expect=%s" % patterns[i] print("expect=%s" % patterns[i])
print "actual=%s" % outlines[i] print("actual=%s" % outlines[i])
return True return True
return False return False