test/py: Make print statements python 3.x safe

In python 3.x print must be called as a function rather than used as a
statement. Update uses of print to the function call syntax in order to
be python 3.x safe.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
lime2-spi
Paul Burton 7 years ago committed by Simon Glass
parent e3396ffd72
commit dffd56d1d2
  1. 2
      test/py/conftest.py
  2. 6
      test/py/test.py
  3. 12
      test/py/tests/test_fit.py
  4. 2
      test/py/u_boot_console_sandbox.py
  5. 2
      test/py/u_boot_spawn.py

@ -586,7 +586,7 @@ def pytest_runtest_protocol(item, nextitem):
# is fixed, if this exception still exists, it will then be logged as # is fixed, if this exception still exists, it will then be logged as
# part of the test's stdout. # part of the test's stdout.
import traceback import traceback
print 'Exception occurred while logging runtest status:' print('Exception occurred while logging runtest status:')
traceback.print_exc() traceback.print_exc()
# FIXME: Can we force a test failure here? # FIXME: Can we force a test failure here?

@ -7,6 +7,8 @@
# Wrapper script to invoke pytest with the directory name that contains the # Wrapper script to invoke pytest with the directory name that contains the
# U-Boot tests. # U-Boot tests.
from __future__ import print_function
import os import os
import os.path import os.path
import sys import sys
@ -26,7 +28,7 @@ except:
traceback.print_exc() traceback.print_exc()
# Hint to the user that they likely simply haven't installed the required # Hint to the user that they likely simply haven't installed the required
# dependencies. # dependencies.
print >>sys.stderr, ''' print('''
exec(py.test) failed; perhaps you are missing some dependencies? exec(py.test) failed; perhaps you are missing some dependencies?
See test/py/README.md for the list.''' See test/py/README.md for the list.''', file=sys.stderr)
sys.exit(1) sys.exit(1)

@ -3,6 +3,8 @@
# #
# Sanity check of the FIT handling in U-Boot # Sanity check of the FIT handling in U-Boot
from __future__ import print_function
import os import os
import pytest import pytest
import struct import struct
@ -153,7 +155,7 @@ def test_fit(u_boot_console):
src = make_fname('u-boot.dts') src = make_fname('u-boot.dts')
dtb = make_fname('u-boot.dtb') dtb = make_fname('u-boot.dtb')
with open(src, 'w') as fd: with open(src, 'w') as fd:
print >> fd, base_fdt print(base_fdt, file=fd)
util.run_and_log(cons, ['dtc', src, '-O', 'dtb', '-o', dtb]) util.run_and_log(cons, ['dtc', src, '-O', 'dtb', '-o', dtb])
return dtb return dtb
@ -167,7 +169,7 @@ def test_fit(u_boot_console):
""" """
its = make_fname('test.its') its = make_fname('test.its')
with open(its, 'w') as fd: with open(its, 'w') as fd:
print >> fd, base_its % params print(base_its % params, file=fd)
return its return its
def make_fit(mkimage, params): def make_fit(mkimage, params):
@ -186,7 +188,7 @@ def test_fit(u_boot_console):
its = make_its(params) its = make_its(params)
util.run_and_log(cons, [mkimage, '-f', its, fit]) util.run_and_log(cons, [mkimage, '-f', its, fit])
with open(make_fname('u-boot.dts'), 'w') as fd: with open(make_fname('u-boot.dts'), 'w') as fd:
print >> fd, base_fdt print(base_fdt, file=fd)
return fit return fit
def make_kernel(filename, text): def make_kernel(filename, text):
@ -202,7 +204,7 @@ def test_fit(u_boot_console):
for i in range(100): for i in range(100):
data += 'this %s %d is unlikely to boot\n' % (text, i) data += 'this %s %d is unlikely to boot\n' % (text, i)
with open(fname, 'w') as fd: with open(fname, 'w') as fd:
print >> fd, data print(data, file=fd)
return fname return fname
def make_ramdisk(filename, text): def make_ramdisk(filename, text):
@ -216,7 +218,7 @@ def test_fit(u_boot_console):
for i in range(100): for i in range(100):
data += '%s %d was seldom used in the middle ages\n' % (text, i) data += '%s %d was seldom used in the middle ages\n' % (text, i)
with open(fname, 'w') as fd: with open(fname, 'w') as fd:
print >> fd, data print(data, file=fd)
return fname return fname
def find_matching(text, match): def find_matching(text, match):

@ -41,7 +41,7 @@ class ConsoleSandbox(ConsoleBase):
bcfg = self.config.buildconfig bcfg = self.config.buildconfig
config_spl = bcfg.get('config_spl', 'n') == 'y' config_spl = bcfg.get('config_spl', 'n') == 'y'
fname = '/spl/u-boot-spl' if config_spl else '/u-boot' fname = '/spl/u-boot-spl' if config_spl else '/u-boot'
print fname print(fname)
cmd = [] cmd = []
if self.config.gdbserver: if self.config.gdbserver:
cmd += ['gdbserver', self.config.gdbserver] cmd += ['gdbserver', self.config.gdbserver]

@ -58,7 +58,7 @@ class Spawn(object):
os.chdir(cwd) os.chdir(cwd)
os.execvp(args[0], args) os.execvp(args[0], args)
except: except:
print 'CHILD EXECEPTION:' print('CHILD EXECEPTION:')
import traceback import traceback
traceback.print_exc() traceback.print_exc()
finally: finally:

Loading…
Cancel
Save