[pytest] Fix pytest conftest.py issue#1125
Merged
lguohan merged 2 commits intosonic-net:masterfrom Sep 26, 2019
wangxin:fix-pytest-conftest
Merged
[pytest] Fix pytest conftest.py issue#1125lguohan merged 2 commits intosonic-net:masterfrom wangxin:fix-pytest-conftest
lguohan merged 2 commits intosonic-net:masterfrom
wangxin:fix-pytest-conftest
Conversation
added 2 commits
September 20, 2019 14:52
* Fixed some issues in the tests/conftest.py: 1. Code style, line too long, etc. 2. Removed the code for adding the current dir to sys.path. The pytest framework has done this automatically. 3. Removed duplicated definition of testbed_devices fixture. * Add empty conftest.py files to tests/platform and tests/platform/mellanox for pytest to automatically add these folders to sys.path when needed. If just run test scripts under tests/platform/mellanox, there is issue of importing the conn_graph_facts fixture defined in the tests/platform folder. Just add a new conftest.py to tests/platform can solve this issue. Signed-off-by: Xin Wang <xinw@mellanox.com>
lguohan
approved these changes
Sep 26, 2019
lguohan
pushed a commit
that referenced
this pull request
Oct 8, 2019
* Porting back pytest change from master to 201811 update device info to add more facts add log analyzer add check daemon status test add check interface status test add Mellanox check sfp presence test update reboot, config reload and sequential restart test update sfp test update check sysfs test update platform fixture * fix review comments Rebase to add some new master PR: #1130 [platform] Fix the reboot SONiC stuck issue #1120 [platform] Disable log analyzer for the reload and restart cases #1125 [pytest] Fix pytest conftest.py issue * update loganalyzer ignore log * [tests/platform/mellanox] check PSU state against sysfs on Mellanox devices (#1082) * [psu test case] check psu state against vendor specific info. for mellanox, check sysfs * [test_platform_info.py]handle "NOT PRESENT" in test_show_platform_psustatus * [psu testcase] address comments Conflicts: tests/platform/mellanox/check_sysfs.py * [check_sysfs] rewords. * [check_sysfs.py] rewording Conflicts: tests/platform/mellanox/check_sysfs.py * reduce redundant code and rename function * remove redundant code
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
2 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
Summary:
Fixes # (issue)
The pytest framework has done this automatically.
tests/platform/mellanox for pytest to automatically add
these folders to sys.path when needed.
If just run test scripts under tests/platform/mellanox, there is
issue of importing the conn_graph_facts fixture defined in
the tests/platform folder. Just add a new conftest.py to
tests/platform can solve this issue.
Type of change
Approach
How did you do it?
How did you verify/test it?
Tested on Mellanox platform
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation