colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix pylint errors in u_boot_utils.py

Browse Source 
* there is no os.path.unlink() method
* don't inherit from object
* add module docstring
* move imports to the top
* avoid unused variable

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt
2021-11-23 00:01:47 +01:00
parent 67e9b64701
commit 9aa1a14d13
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/py/u_boot_utils.py
View File

@@ -1,17 +1,20 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
# Utility code shared across multiple tests. """
Utility code shared across multiple tests.
"""
import hashlib import hashlib
import inspect import inspect
import os import os
import os.path import os.path
import pytest import pathlib
import signal import signal
import sys import sys
import time import time
import re import re
import pytest
def md5sum_data(data): def md5sum_data(data):
"""Calculate the MD5 hash of some data. """Calculate the MD5 hash of some data.
@@ -48,7 +51,7 @@ def md5sum_file(fn, max_length=None):
data = fh.read(*params) data = fh.read(*params)
return md5sum_data(data) return md5sum_data(data)
class PersistentRandomFile(object): class PersistentRandomFile:
"""Generate and store information about a persistent file containing """Generate and store information about a persistent file containing
random data.""" random data."""
@@ -144,7 +147,7 @@ def wait_until_file_open_fails(fn, ignore_errors):
Nothing. Nothing.
""" """
for i in range(100): for _ in range(100):
fh = attempt_to_open_file(fn) fh = attempt_to_open_file(fn)
if not fh: if not fh:
return return
@@ -192,9 +195,9 @@ def run_and_log_expect_exception(u_boot_console, cmd, retcode, msg):
try: try:
runner = u_boot_console.log.get_runner(cmd[0], sys.stdout) runner = u_boot_console.log.get_runner(cmd[0], sys.stdout)
runner.run(cmd) runner.run(cmd)
except Exception as e: except Exception:
assert(retcode == runner.exit_status) assert retcode == runner.exit_status
assert(msg in runner.output) assert msg in runner.output
else: else:
raise Exception("Expected an exception with retcode %d message '%s'," raise Exception("Expected an exception with retcode %d message '%s',"
"but it was not raised" % (retcode, msg)) "but it was not raised" % (retcode, msg))
@@ -279,17 +282,17 @@ class PersistentFileHelperCtxMgr(object):
if filename_timestamp < self.module_timestamp: if filename_timestamp < self.module_timestamp:
self.log.action('Removing stale generated file ' + self.log.action('Removing stale generated file ' +
self.filename) self.filename)
os.unlink(self.filename) pathlib.Path(self.filename).unlink()
def __exit__(self, extype, value, traceback): def __exit__(self, extype, value, traceback):
if extype: if extype:
try: try:
os.path.unlink(self.filename) pathlib.Path(self.filename).unlink()
except: except Exception:
pass pass
return return
logged = False logged = False
for i in range(20): for _ in range(20):
filename_timestamp = os.path.getmtime(self.filename) filename_timestamp = os.path.getmtime(self.filename)
if filename_timestamp > self.module_timestamp: if filename_timestamp > self.module_timestamp:
break break