Skip to content

Skip both empty line and also new line in the output of portstat.#7657

Merged
wenyiz2021 merged 1 commit intosonic-net:masterfrom
ysmanman:fix-parse-portstat
Mar 7, 2023
Merged

Skip both empty line and also new line in the output of portstat.#7657
wenyiz2021 merged 1 commit intosonic-net:masterfrom
ysmanman:fix-parse-portstat

Conversation

@ysmanman
Copy link
Copy Markdown
Contributor

@ysmanman ysmanman commented Mar 6, 2023

Description of PR

#7560 was closed with #7537. However, we still observed the the issue in our testing even with #7537. The fix in #7537 is incomplete because it only skips new line, but fails to skip empty line. Fix the issue in this PR to skip both new line and empty line.

Summary:
Fixes # (issue)

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

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

Documentation

@wangxin
Copy link
Copy Markdown
Collaborator

wangxin commented Mar 6, 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/common/portstat_utilities.py:69:29: E261 at least two spaces before inline comment

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>

@ysmanman
Copy link
Copy Markdown
Contributor Author

ysmanman commented Mar 6, 2023

Add @arlakshm @wenyiz2021 for visibility.

@wenyiz2021
Copy link
Copy Markdown
Contributor

thanks @ysmanman for this fix!
sorry for missing to check the final fix for PR#7537. I was doing [separation_line_number+1:reminder_line_number-1] and skipped all last 3 lines in my pdb.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants