Skip to content

Fixed command /usr/bin/thermalctld to /usr/local/bin/thermalctld in platform test #3178

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
wangxin merged 3 commits into from
May 12, 2021
Merged

Fixed command /usr/bin/thermalctld to /usr/local/bin/thermalctld in platform test #3178

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4b5be9
Fixed command /usr/bin/thermalctld to /usr/local/bin/thermalctld
andriyz-nv Mar 19, 2021
0ee1983
Addressed comments provided by Joe LeVeque
andriyz-nv Apr 26, 2021
9d6e24e
Merge remote-tracking branch 'upstream/master'
andriyz-nv 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
8 changes: 6 additions & 2 deletions tests/platform_tests/test_platform_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,13 @@ def test_thermal_control_fan_status(duthosts, rand_one_dut_hostname, mocker_fact

single_fan_mocker = mocker_factory(duthost, 'SingleFanMocker')
time.sleep(THERMAL_CONTROL_TEST_WAIT_TIME)
if "201811" in duthost.os_version or "201911" in duthost.os_version:
THERMALCTLD_PATH = '/usr/bin/thermalctld'
else:
THERMALCTLD_PATH = '/usr/local/bin/thermalctld'

_fan_log_supported = duthost.command('docker exec pmon grep -E "{}" /usr/bin/thermalctld'\
.format(LOG_EXPECT_INSUFFICIENT_FAN_NUM_RE), module_ignore_errors=True)
_fan_log_supported = duthost.command('docker exec pmon grep -E "{}" {}'\
.format(LOG_EXPECT_INSUFFICIENT_FAN_NUM_RE, THERMALCTLD_PATH), module_ignore_errors=True)

if single_fan_mocker.is_fan_removable():
loganalyzer.expect_regex = [LOG_EXPECT_FAN_REMOVE_RE, LOG_EXPECT_INSUFFICIENT_FAN_NUM_RE]
Expand Down