mirror of
https://xff.cz/git/u-boot/
synced 2025-09-03 17:52:07 +02:00
test/py: Manual python3 fixes
- 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 <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com> Tested-by: Simon Glass <sjg@chromium.org> [on sandbox] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -13,17 +13,16 @@
|
||||
# - Implementing custom pytest markers.
|
||||
|
||||
import atexit
|
||||
import configparser
|
||||
import errno
|
||||
import io
|
||||
import os
|
||||
import os.path
|
||||
import pytest
|
||||
from _pytest.runner import runtestprotocol
|
||||
import re
|
||||
import io
|
||||
from _pytest.runner import runtestprotocol
|
||||
import sys
|
||||
|
||||
import configparser
|
||||
|
||||
# Globals: The HTML log file, and the connection to the U-Boot console.
|
||||
log = None
|
||||
console = None
|
||||
@@ -168,7 +167,7 @@ def pytest_configure(config):
|
||||
ini_str = '[root]\n' + f.read()
|
||||
ini_sio = io.StringIO(ini_str)
|
||||
parser = configparser.RawConfigParser()
|
||||
parser.readfp(ini_sio)
|
||||
parser.read_file(ini_sio)
|
||||
ubconfig.buildconfig.update(parser.items('root'))
|
||||
|
||||
ubconfig.test_py_dir = test_py_dir
|
||||
|
Reference in New Issue
Block a user