Skip to content

[cherry pick] #9523 Fix PR #9312 for KeyError and AttributeError in 202305#9592

Merged
wangxin merged 2 commits intosonic-net:202305from
yutongzhang-microsoft:yutongzhang/cherry_pick_9523_202305
Aug 28, 2023
Merged

[cherry pick] #9523 Fix PR #9312 for KeyError and AttributeError in 202305#9592
wangxin merged 2 commits intosonic-net:202305from
yutongzhang-microsoft:yutongzhang/cherry_pick_9523_202305

Conversation

@yutongzhang-microsoft
Copy link
Copy Markdown
Contributor

Description of PR

Cherry pick conflict #9523

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?

Cherry pick conflict #9523

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

@mssonicbld
Copy link
Copy Markdown
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

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/utilities.py:942:1: E302 expected 2 blank lines, found 1

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

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>

StormLiangMS
StormLiangMS previously approved these changes Aug 22, 2023
Copy link
Copy Markdown
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wangxin wangxin merged commit 91c1bfc into sonic-net:202305 Aug 28, 2023
@yutongzhang-microsoft yutongzhang-microsoft deleted the yutongzhang/cherry_pick_9523_202305 branch September 5, 2023 01:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants