Skip to content

[platform] Register platform_tests/api tests options to root conftest #9106

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.

Sign up for GitHub

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

Merged
yaqiangz merged 1 commit into from
Jul 25, 2023
Merged

[platform] Register platform_tests/api tests options to root conftest #9106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
'tests.common.plugins.custom_fixtures',
'tests.common.dualtor',
'tests.decap',
'tests.platform_tests.api',
'tests.common.plugins.allure_server',
'tests.common.plugins.conditional_mark')

Expand Down
2 changes: 2 additions & 0 deletions tests/platform_tests/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def pytest_addoption(parser):
parser.addoption("--unresettable_xcvr_types", action="append", default=[], help="unsupported resettable xcvr types")
4 changes: 0 additions & 4 deletions tests/platform_tests/api/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,3 @@ def check_not_implemented_warnings(duthosts, enum_rand_one_per_hwsku_hostname):
yield
loganalyzer.match_regex.extend(['WARNING pmon#platform_api_server.py: API.+not implemented'])
loganalyzer.analyze(marker)


def pytest_addoption(parser):
parser.addoption("--unresettable_xcvr_types", action="append", default=[], help="unsupported resettable xcvr types")
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from tests.common.utilities import skip_release
from tests.common.platform.interface_utils import get_physical_port_indices
from tests.platform_tests.cli.util import get_skip_mod_list
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

###################################################
# TODO: Remove this after we transition to Python 3
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_chassis_fans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import pytest

from tests.common.helpers.platform_api import chassis, fan
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase
from tests.platform_tests.thermal_control_test_helper import start_thermal_control_daemon, stop_thermal_control_daemon

###################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from tests.common.helpers.assertions import pytest_assert
from tests.common.helpers.platform_api import chassis, component
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase
from tests.common.utilities import skip_release_for_platform

###################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_fan_drawer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from tests.common.helpers.platform_api import chassis, fan_drawer

from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

###################################################
# TODO: Remove this after we transition to Python 3
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_fan_drawer_fans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from tests.common.helpers.platform_api import chassis, fan_drawer, fan_drawer_fan
from tests.platform_tests.thermal_control_test_helper import start_thermal_control_daemon, stop_thermal_control_daemon
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

###################################################
# TODO: Remove this after we transition to Python 3
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from time import sleep
from tests.common.helpers.platform_api import chassis, module
from tests.platform_tests.cli.util import get_skip_mod_list
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase
from tests.common.helpers.assertions import pytest_assert
from tests.common.helpers.dut_utils import ignore_t2_syslog_msgs

Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_psu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from tests.common.helpers.platform_api import chassis, psu
from tests.common.utilities import skip_release
from tests.platform_tests.cli.util import get_skip_mod_list
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase
from tests.common.utilities import skip_release_for_platform


Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_psu_fans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from tests.common.helpers.platform_api import chassis, psu, psu_fan

from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

###################################################
# TODO: Remove this after we transition to Python 3
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_sfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from tests.common.fixtures.duthost_utils import shutdown_ebgp # noqa F401
from tests.common.mellanox_data import is_mellanox_device

from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

###################################################
# TODO: Remove this after we transition to Python 3
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from tests.common.helpers.platform_api import chassis, thermal
from tests.common.utilities import skip_release_for_platform

from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

###################################################
# TODO: Remove this after we transition to Python 3
Expand Down
2 changes: 1 addition & 1 deletion tests/platform_tests/api/test_watchdog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pytest
from tests.common.helpers.platform_api import watchdog
from tests.common.helpers.assertions import pytest_assert
from platform_api_test_base import PlatformApiTestBase
from .platform_api_test_base import PlatformApiTestBase

from collections import OrderedDict

Expand Down