u-boot.git/test/py, branch v2020.01-rc2

test/py: Use raw strings more to avoid deprecation warnings

2019-10-30T21:48:47+00:00

We have two further uses of raw string usage in the test/py codebase
that are used under CI.  The first of which is under the bind test and
is a direct update.  The second of which is to strip VT100 codes from
the match buffer.  While switching this to a raw string is also a direct
update, the comment it notes that problems were encountered on Ubuntu
14.04 (and whatever Python 2 version that was) that required slight
tweaks to the regex.  Replace that now that we're saying Python 3.5 is
the minimum.

Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: Update docs, add requirements.txt for pip

2019-10-30T21:48:47+00:00

To be more closely aligned with Python community best practices, we need
to better document our usage of pip and make use of a requirements.txt
file that shows the versions of the tools that we are using.  This will
aide in ensuring reproducibility of our tests as well.

Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: Rework test.py to be a different kind of wrapper

2019-10-30T21:48:47+00:00

Now that we have moved to being based on pytest for python3 we need to
make our test.py wrapper more robust in terms of only calling python3
rather than possibly finding and using python2.  To do this, change from
execvp()'ing pytest to invoking the package itself via python.  In the
event that pytest is unavailable we still get a user-friendly error:

pkg_resources.DistributionNotFound: The 'pytest' distribution was not found and is required by the application

Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: Update test_fs to decode check_output calls

2019-10-30T21:48:47+00:00

The check_output function from the subprocess Python module by default
returns data as encoded bytes and leaves decoding to the application.
Given our uses of the call, it makes the most sense to immediately
decode the results.

Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: test_efi_selftest.py: Updates for python 3 support

2019-10-30T21:48:47+00:00

- In python 3 you must use raw strings for regex as other forms are
  deprecated and would require further changes to the pattern here.
  In one case this lets us have a simpler match pattern.
- As strings are now Unicode our complex tests (Euro symbol,
  SHIFT+ALT+FN 5) we need to declare that as a bytes string and then
  decode it for use.

Cc: Heinrich Schuchardt 
Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: test_ut.py: Ensure we use bytes

2019-10-30T21:48:47+00:00

In the case of some unit tests we are working with providing a fake
flash device that we have written some text strings in to.  In this case
we want to tell Python to encode things to bytes for us.

Reviewed-by: Stephen Warren 
Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: Manual python3 fixes

2019-10-30T21:48:47+00:00

- Modern pytest is more visible in telling us about parameters that we
  had not described, so describe a few more.
- ConfigParser.readfp(...) is now configparser.read_file(...)
- As part of the "strings vs bytes" conversions in Python 3, we use the
  default encoding/decoding of utf-8 but in some places tell Python to
  replace problematic conversions rather than throw a fatal error.
- Fix a typo noticed while doing the above ("tot he" -> "to the").
- As suggested by Stephen, re-alphabetize the import list
- Per Heinrich, replace how we write contents in test_fit.py

Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: Automated conversion to Python 3

2019-10-30T21:48:47+00:00

Use the 2to3 tool to perform numerous automatic conversions from Python
2 syntax to Python 3.  Also fix whitespace problems that Python 3
catches that Python 2 did not.

Reviewed-by: Stephen Warren 
Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini

test/py: Fix pytest4 deprecation warnings

2019-10-30T21:48:47+00:00

Fix the following spit from pytest:

u-boot/test/py/conftest.py:438: RemovedInPytest4Warning: MarkInfo objects are deprecated as they contain merged marks which are hard to deal with correctly.
  Please use node.get_closest_marker(name) or node.iter_markers(name).
  Docs: https://docs.pytest.org/en/latest/mark.html#updating-code
    for board in mark.args:

In both cases, the later suggestion is applicable.

Reviewed-by: Stephen Warren 
Reviewed-by: Simon Glass 
Signed-off-by: Marek Vasut 
Cc: Igor Opaniuk 
[trini: Update for current file with a few more cases, un-pin pytest in CI]
Tested-by: Simon Glass  [on sandbox]
Tested-by: Stephen Warren 
Signed-off-by: Tom Rini

test/py: Split mark to multiple lines

2019-10-30T21:48:46+00:00

We inconsistently note multiple dependencies today in our tests,
sometimes with a single line that declares multiple and sometimes
multiple single lines.  Current pytest seems to fail on the single line
format so change to multiple declarations.

Reviewed-by: Stephen Warren 
Reviewed-by: Simon Glass 
Tested-by: Stephen Warren 
Tested-by: Simon Glass  [on sandbox]
Signed-off-by: Tom Rini