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

Introduce option to define timeout for time-consuming file operations

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@huawei.com>
This commit is contained in:
Robert Baldyga 2024-10-02 21:52:08 +02:00
parent 9344c16b7c
commit cfd1b30de4
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test_tools/fs_utils.py
View File

@ -168,9 +168,8 @@ def create_file(path):
return TestRun.executor.run_expect_success(cmd) return TestRun.executor.run_expect_success(cmd)
def compare(file, other_file): def compare(file, other_file, timeout: timedelta = timedelta(minutes=30)):
output = TestRun.executor.run( output = TestRun.executor.run(f"cmp --silent \"{file}\" \"{other_file}\"", timeout)
f"cmp --silent \"{file}\" \"{other_file}\"")
if output.exit_code == 0: if output.exit_code == 0:
return True return True
elif output.exit_code > 1: elif output.exit_code > 1:
@ -179,9 +178,8 @@ def compare(file, other_file):
return False return False
def diff(file, other_file): def diff(file, other_file, timeout: timedelta = timedelta(minutes=30)):
output = TestRun.executor.run( output = TestRun.executor.run(f"diff \"{file}\" \"{other_file}\"", timeout)
f"diff \"{file}\" \"{other_file}\"")
if output.exit_code == 0: if output.exit_code == 0:
return None return None
elif output.exit_code > 1: elif output.exit_code > 1:
@ -190,8 +188,8 @@ def diff(file, other_file):
return output.stderr return output.stderr
def md5sum(file, binary=True): def md5sum(file, binary=True, timeout: timedelta = timedelta(minutes=30)):
output = TestRun.executor.run(f"md5sum {'-b' if binary else ''} {file}") output = TestRun.executor.run(f"md5sum {'-b' if binary else ''} {file}", timeout)
if output.exit_code != 0: if output.exit_code != 0:
raise Exception(f"Md5sum command execution failed! {output.stdout}\n{output.stderr}") raise Exception(f"Md5sum command execution failed! {output.stdout}\n{output.stderr}")
return output.stdout.split()[0] return output.stdout.split()[0]

12
test_utils/filesystem/file.py
View File

@ -14,14 +14,14 @@ class File(FsItem):
def __init__(self, full_path): def __init__(self, full_path):
FsItem.__init__(self, full_path) FsItem.__init__(self, full_path)
def compare(self, other_file): def compare(self, other_file, timeout: timedelta = timedelta(minutes=30)):
return fs_utils.compare(str(self), str(other_file)) return fs_utils.compare(str(self), str(other_file), timeout)
def diff(self, other_file): def diff(self, other_file, timeout: timedelta = timedelta(minutes=30)):
return fs_utils.diff(str(self), str(other_file)) return fs_utils.diff(str(self), str(other_file), timeout)
def md5sum(self, binary=True): def md5sum(self, binary=True, timeout: timedelta = timedelta(minutes=30)):
return fs_utils.md5sum(str(self), binary) return fs_utils.md5sum(str(self), binary, timeout)
def read(self): def read(self):
return fs_utils.read_file(str(self)) return fs_utils.read_file(str(self))