Skip to content

Fix regular expression in test_platform_info.py #2587

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
liat-grozovik merged 1 commit into from
Nov 26, 2020
Merged

Fix regular expression in test_platform_info.py #2587

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
10 changes: 6 additions & 4 deletions tests/platform_tests/test_platform_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@
LOG_EXPECT_INSUFFICIENT_FAN_NUM_RE = '.*Insufficient number of working fans warning:.*'
LOG_EXPECT_INSUFFICIENT_FAN_NUM_CLEAR_RE = '.*Insufficient number of working fans warning cleared:.*'

SKIP_ERROR_LOG_SHOW_PLATFORM_TEMP = ['ERR pmon#thermalctld.*int() argument must be a string or a number',
'ERR pmon#thermalctld.*invalid literal for int() with base 10']
SKIP_ERROR_LOG_SHOW_PLATFORM_TEMP = ['.*ERR pmon#thermalctld.*int\(\) argument must be a string or a number.*',
'.*ERR pmon#thermalctld.*invalid literal for int\(\) with base 10.*']

SKIP_ERROR_LOG_PSU_ABSENCE = ['.*Error getting sensor data: dps460.*Kernel interface error.*']


def check_sensord_status(ans_host):
Expand Down Expand Up @@ -175,7 +177,7 @@ def check_all_psu_on(dut, psu_test_results):


@pytest.mark.disable_loganalyzer
@pytest.mark.parametrize('ignore_particular_error_log', [['Error getting sensor data: dps460.*Kernel interface error']], indirect=True)
@pytest.mark.parametrize('ignore_particular_error_log', [SKIP_ERROR_LOG_PSU_ABSENCE], indirect=True)
def test_turn_on_off_psu_and_check_psustatus(duthosts, rand_one_dut_hostname, psu_controller, ignore_particular_error_log):
"""
@summary: Turn off/on PSU and check PSU status using 'show platform psustatus'
Expand Down Expand Up @@ -313,7 +315,7 @@ def check_thermal_control_load_invalid_file(duthost, file_name):


@pytest.mark.disable_loganalyzer
@pytest.mark.parametrize('ignore_particular_error_log', [['Error getting sensor data: dps460.*Kernel interface error']], indirect=True)
@pytest.mark.parametrize('ignore_particular_error_log', [SKIP_ERROR_LOG_PSU_ABSENCE], indirect=True)
def test_thermal_control_psu_absence(duthosts, rand_one_dut_hostname, psu_controller, mocker_factory, ignore_particular_error_log):
"""
@summary: Turn off/on PSUs, check thermal control is working as expect.
Expand Down