Skip to content

[Mellanox] Fixed issue: failed to recover mock file #3407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liat-grozovik merged 4 commits into from
Apr 27, 2021
Merged

[Mellanox] Fixed issue: failed to recover mock file #3407

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7de2b01
Remove check for /var/run/hw-management/config/suspend since it is no…
Junchao-Mellanox Apr 12, 2021
eb9f2d1
Merge remote-tracking branch 'upstream/master'
Junchao-Mellanox Apr 19, 2021
14d301e
Merge remote-tracking branch 'upstream/master'
Junchao-Mellanox Apr 25, 2021
149565f
[Mellanox] Fixed issue: failed to recover mock file
Junchao-Mellanox Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions tests/platform_tests/mellanox/mellanox_thermal_control_test_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,14 @@ def mock_value(self, file_path, value):
:param value: Value to write to sys fs file.
:return:
"""
out = self.dut.stat(path=file_path)
if not out['stat']['exists']:
raise SysfsNotExistError('{} not exist'.format(file_path))
if out['stat']['islnk']:
self._unlink(file_path)
else:
self._cache_file_value(file_path)
if file_path not in self.regular_file_list and file_path not in self.unlink_file_list:
out = self.dut.stat(path=file_path)
if not out['stat']['exists']:
raise SysfsNotExistError('{} not exist'.format(file_path))
if out['stat']['islnk']:
self._unlink(file_path)
else:
self._cache_file_value(file_path)
self.dut.shell('echo \'{}\' > {}'.format(value, file_path))

def read_thermal_value(self, file_path):
Expand Down Expand Up @@ -242,26 +243,24 @@ def _cache_file_value(self, file_path):
:param file_path: Regular file path.
:return:
"""
if file_path not in self.regular_file_list:
try:
output = self.dut.command("cat %s" % file_path)
value = output["stdout"]
self.regular_file_list[file_path] = value.strip()
except Exception as e:
assert 0, "Get content from %s failed, exception: %s" % (file_path, repr(e))
try:
output = self.dut.command("cat %s" % file_path)
value = output["stdout"]
self.regular_file_list[file_path] = value.strip()
except Exception as e:
assert 0, "Get content from %s failed, exception: %s" % (file_path, repr(e))

def _unlink(self, file_path):
"""
Unlink given sys fs file, record its soft link target.
:param file_path: Sys fs file path.
:return:
"""
if file_path not in self.unlink_file_list:
readlink_output = self.dut.command('readlink {}'.format(file_path))
self.unlink_file_list[file_path] = readlink_output["stdout"]
self.dut.command('unlink {}'.format(file_path))
self.dut.command('touch {}'.format(file_path))
self.dut.command('chown admin {}'.format(file_path))
readlink_output = self.dut.command('readlink {}'.format(file_path))
self.unlink_file_list[file_path] = readlink_output["stdout"]
self.dut.command('unlink {}'.format(file_path))
self.dut.command('touch {}'.format(file_path))
self.dut.command('chown admin {}'.format(file_path))

def deinit(self):
"""
Expand Down