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.

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

[MASIC] disable thermalctld when running test_fan_drawer_fans.py #5529

Merged
merged 9 commits into from
Apr 22, 2022
Merged

[MASIC] disable thermalctld when running test_fan_drawer_fans.py #5529

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6942df1
Update test_po_cleanup.py
wenyiz2021 Apr 4, 2022
ff5e9ba
Merge branch 'Azure:master' into master
wenyiz2021 Apr 7, 2022
702ae0b
Merge branch 'Azure:master' into master
wenyiz2021 Apr 13, 2022
04524ff
Update test_fan_drawer_fans.py
wenyiz2021 Apr 13, 2022
8c4e612
Merge branch 'Azure:master' into master
wenyiz2021 Apr 14, 2022
103193a
Update test_fan_drawer_fans.py
wenyiz2021 Apr 14, 2022
b1f997b
Merge branch 'Azure:master' into master
wenyiz2021 Apr 15, 2022
2165081
Merge branch 'Azure:master' into master
wenyiz2021 Apr 18, 2022
7af244d
Update test_fan_drawer_fans.py
wenyiz2021 Apr 18, 2022
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
8 changes: 5 additions & 3 deletions 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 @@ -8,7 +8,7 @@

from tests.common.helpers.assertions import pytest_assert
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

###################################################
Expand Down Expand Up @@ -48,7 +48,7 @@ class TestFanDrawerFans(PlatformApiTestBase):
# level, so we must do the same here to prevent a scope mismatch.

@pytest.fixture(scope="function", autouse=True)
def setup(self, platform_api_conn):
def setup(self, platform_api_conn, duthost):
if self.num_fan_drawers is None:
try:
self.num_fan_drawers = chassis.get_num_fan_drawers(platform_api_conn)
Expand All @@ -57,7 +57,9 @@ def setup(self, platform_api_conn):
else:
if self.num_fan_drawers == 0:
pytest.skip("No fan drawers found on device")

stop_thermal_control_daemon(duthost)
yield
start_thermal_control_daemon(duthost)
#
# Helper functions
#
Expand Down