Fixed command /usr/bin/thermalctld to /usr/local/bin/thermalctld in platform test#3178
Merged
wangxin merged 3 commits intosonic-net:masterfrom May 12, 2021
Merged
Fixed command /usr/bin/thermalctld to /usr/local/bin/thermalctld in platform test#3178wangxin merged 3 commits intosonic-net:masterfrom
wangxin merged 3 commits intosonic-net:masterfrom
Conversation
The file path was changed in bellow pull request, but tests in sonic-mgmt were not updated, after that PR was merged sonic-net/sonic-buildimage#6176
jleveque
suggested changes
Mar 19, 2021
| time.sleep(THERMAL_CONTROL_TEST_WAIT_TIME) | ||
|
|
||
| _fan_log_supported = duthost.command('docker exec pmon grep -E "{}" /usr/bin/thermalctld'\ | ||
| _fan_log_supported = duthost.command('docker exec pmon grep -E "{}" /usr/local/bin/thermalctld'\ |
Contributor
There was a problem hiding this comment.
Thanks for catching and fixing! However, these tests are expected to run on older versions of SONiC, before the path was changed. Thus I suggest something like the following:
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 "{}" {}'
.format(LOG_EXPECT_INSUFFICIENT_FAN_NUM_RE, THERMALCTLD_PATH), module_ignore_errors=True)
Collaborator
|
@andriyz-nv, Can you address the review comments? |
andriyz-nv
commented
Apr 26, 2021
Contributor
Author
andriyz-nv
left a comment
andriyz-nv
left a comment
There was a problem hiding this comment.
@jleveque I fixed according to your comments
jleveque
approved these changes
Apr 26, 2021
Contributor
Author
|
@wangxin can you please review? |
wangxin
approved these changes
May 12, 2021
vmittal-msft
pushed a commit
to vmittal-msft/sonic-mgmt
that referenced
this pull request
Sep 28, 2021
…latform test (sonic-net#3178) The file path was changed in bellow pull request, but tests in sonic-mgmt were not updated, after that PR was merged sonic-net/sonic-buildimage#6176
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
Fixed command /usr/bin/thermalctld to /usr/local/bin/thermalctld
The file path was changed in bellow pull request, but tests in
sonic-mgmt were not updated, after that PR was merged
sonic-net/sonic-buildimage#6176
Summary:
Fixes # (issue)
Type of change
Approach
What is the motivation for this PR?
How did you do it?
How did you verify/test it?
Executed test, test passed without
_fan_log_supported = {'stderr_lines': [u'grep: /usr/bin/thermalctld: No such file or directory'], u...: [], u'start': u'2021-03-17 21:37:36.289661', u'msg': u'non-zero return code'}
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation