Skip to content
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.

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

[system_health] Add support for check_system_health_info both old and new format #7681

Merged
merged 1 commit into from
Mar 8, 2023

Conversation

yaqiangz
Copy link
Contributor

@yaqiangz yaqiangz commented Mar 8, 2023

Description of PR

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(improvement)

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

Test failed introduced by this PR sonic-net/sonic-buildimage#13497 has been fixed by this PR #7649. But in DUT with old image, it will failed.

How did you do it?

Add support for check_system_health_info to support both two formats

How did you verify/test it?

Run test

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@yaqiangz yaqiangz requested a review from prgeor as a code owner March 8, 2023 06:09
@wangxin
Copy link
Collaborator

wangxin commented Mar 8, 2023

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/system_health/test_system_health.py:12:1: F401 'tests.platform_tests.thermal_control_test_helper.disable_thermal_policy' imported but unused
tests/system_health/test_system_health.py:13:1: F401 'device_mocker.device_mocker_factory' imported but unused
tests/system_health/test_system_health.py:108:31: E712 comparison to True should be 'if cond is True:' or 'if cond:'
tests/system_health/test_system_health.py:114:23: E712 comparison to True should be 'if cond is True:' or 'if cond:'
tests/system_health/test_system_health.py:142:31: E712 comparison to True should be 'if cond is True:' or 'if cond:'
tests/system_health/test_system_health.py:149:69: F811 redefinition of unused 'device_mocker_factory' from line 13
tests/system_health/test_system_health.py:149:92: F811 redefinition of unused 'disable_thermal_policy' from line 12
tests/system_health/test_system_health.py:171:121: E501 line too long (135 > 120 characters)
tests/system_health/test_system_health.py:173:121: E501 line too long (147 > 120 characters)
tests/system_health/test_system_health.py:176:121: E501 line too long (122 > 120 characters)
tests/system_health/test_system_health.py:188:121: E501 line too long (131 > 120 characters)
...
[truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@yaqiangz
Copy link
Contributor Author

yaqiangz commented Mar 8, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@wangxin
Copy link
Collaborator

wangxin commented Mar 8, 2023

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/system_health/test_system_health.py:12:1: F401 'tests.platform_tests.thermal_control_test_helper.disable_thermal_policy' imported but unused
tests/system_health/test_system_health.py:13:1: F401 'device_mocker.device_mocker_factory' imported but unused
tests/system_health/test_system_health.py:108:31: E712 comparison to True should be 'if cond is True:' or 'if cond:'
tests/system_health/test_system_health.py:114:23: E712 comparison to True should be 'if cond is True:' or 'if cond:'
tests/system_health/test_system_health.py:142:31: E712 comparison to True should be 'if cond is True:' or 'if cond:'
tests/system_health/test_system_health.py:149:69: F811 redefinition of unused 'device_mocker_factory' from line 13
tests/system_health/test_system_health.py:149:92: F811 redefinition of unused 'disable_thermal_policy' from line 12
tests/system_health/test_system_health.py:171:121: E501 line too long (135 > 120 characters)
tests/system_health/test_system_health.py:173:121: E501 line too long (147 > 120 characters)
tests/system_health/test_system_health.py:176:121: E501 line too long (122 > 120 characters)
tests/system_health/test_system_health.py:188:121: E501 line too long (131 > 120 characters)
...
[truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@yaqiangz yaqiangz merged commit 446721a into sonic-net:master Mar 8, 2023
wangxin pushed a commit that referenced this pull request Mar 9, 2023
… new format (#7681)

What is the motivation for this PR?
Test failed introduced by this PR sonic-net/sonic-buildimage#13497 has been fixed by this PR #7649. But in DUT with old image, it will failed.

How did you do it?
Add support for check_system_health_info to support both two formats

How did you verify/test it?
Run test

Signed-off-by: Yaqiang Zhu <yaqiangzhu@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants