github/opencas-test-framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from robertbaldyga/fs_utils-timeout

Browse Source 
Introduce option to define timeout for time-consuming file operations
This commit is contained in:
Robert Baldyga
2024-10-03 09:52:40 +02:00
committed by GitHub
parent 1e82bd6d3c cfd1b30de4
commit 073793c83a
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test_tools/fs_utils.py
View File

@@ -164,9 +164,8 @@ def create_file(path):
return TestRun.executor.run_expect_success(cmd)
def compare(file, other_file):
output = TestRun.executor.run(
f"cmp --silent \"{file}\" \"{other_file}\"")
def compare(file, other_file, timeout: timedelta = timedelta(minutes=30)):
output = TestRun.executor.run(f"cmp --silent \"{file}\" \"{other_file}\"", timeout)
if output.exit_code == 0:
return True
elif output.exit_code > 1:
@@ -175,9 +174,8 @@ def compare(file, other_file):
return False
def diff(file, other_file):
output = TestRun.executor.run(
f"diff \"{file}\" \"{other_file}\"")
def diff(file, other_file, timeout: timedelta = timedelta(minutes=30)):
output = TestRun.executor.run(f"diff \"{file}\" \"{other_file}\"", timeout)
if output.exit_code == 0:
return None
elif output.exit_code > 1:
@@ -186,6 +184,13 @@ def diff(file, other_file):
return output.stderr
def md5sum(file, binary=True, timeout: timedelta = timedelta(minutes=30)):
output = TestRun.executor.run(f"md5sum {'-b' if binary else ''} {file}", timeout)
if output.exit_code != 0:
raise Exception(f"Md5sum command execution failed! {output.stdout}\n{output.stderr}")
return output.stdout.split()[0]
# For some reason separators other than '/' don't work when using sed on system paths
# This requires escaping '/' in pattern and target string
def escape_sed_string(string: str, sed_replace: bool = False):