Skip to content

[action] [PR:16897] [test_pfcwd_timer_accuracy]: fix pfc timer accuracy timestamp regex#16932

Merged
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/16897
Feb 12, 2025
Merged

[action] [PR:16897] [test_pfcwd_timer_accuracy]: fix pfc timer accuracy timestamp regex#16932
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/16897

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

Description of PR

Summary:
Fixes # (issue)
same with #16757
31202914

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
  • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

Need handle regex1 too

How did you do it?

Follow previous PR, modify the regex1

How did you verify/test it?


>>> regex = re.compile(r'\b[A-Za-z]{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}\.\d{6}\b')
>>> syslog_msg_1 = "May 29 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_2 = "May 9 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_3 = "May 9 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_4 = "2024 May 29 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_5 = "2024 May 9 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_6 = "2024 May 9 02:47:40.345257 str3-dut INFO"
>>> search_string = regex.search(syslog_msg_1)
>>> search_string
<re.Match object; span=(0, 22), match='May 29 02:47:40.345257'>
>>> search_string.group()
'May 29 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_2)
>>> search_string
<re.Match object; span=(0, 21), match='May 9 02:47:40.345257'>
>>> search_string.group()
'May 9 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_3)
>>> search_string
<re.Match object; span=(0, 22), match='May 9 02:47:40.345257'>
>>> search_string.group()
'May 9 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_4)
>>> search_string
<re.Match object; span=(5, 27), match='May 29 02:47:40.345257'>
>>> search_string.group()
'May 29 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_5)
>>> search_string
<re.Match object; span=(5, 26), match='May 9 02:47:40.345257'>
>>> search_string.group()
'May 9 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_6)
>>> search_string
<re.Match object; span=(5, 27), match='May 9 02:47:40.345257'>
>>> search_string.group()
'May 9 02:47:40.345257'
>>> 
admin@bjw-can-7060-1:~$ 
admin@bjw-can-7060-1:~$ date -d 'May 29 02:47:40.345257' +%s%3N
1748486860345
admin@bjw-can-7060-1:~$ date -d 'May 9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ date -d 'May 9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ date -d 'May 29 02:47:40.345257' +%s%3N
1748486860345
admin@bjw-can-7060-1:~$ date -d 'May 9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ date -d 'May 9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ 

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

…onic-net#16897)

What is the motivation for this PR?
Need handle regex1 too

How did you do it?
Follow previous PR, modify the regex1

How did you verify/test it?

>>> regex = re.compile(r'\b[A-Za-z]{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}\.\d{6}\b')
>>> syslog_msg_1 = "May 29 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_2 = "May 9 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_3 = "May  9 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_4 = "2024 May 29 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_5 = "2024 May 9 02:47:40.345257 str3-dut INFO"
>>> syslog_msg_6 = "2024 May  9 02:47:40.345257 str3-dut INFO"
>>> search_string = regex.search(syslog_msg_1)
>>> search_string
<re.Match object; span=(0, 22), match='May 29 02:47:40.345257'>
>>> search_string.group()
'May 29 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_2)
>>> search_string
<re.Match object; span=(0, 21), match='May 9 02:47:40.345257'>
>>> search_string.group()
'May 9 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_3)
>>> search_string
<re.Match object; span=(0, 22), match='May  9 02:47:40.345257'>
>>> search_string.group()
'May  9 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_4)
>>> search_string
<re.Match object; span=(5, 27), match='May 29 02:47:40.345257'>
>>> search_string.group()
'May 29 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_5)
>>> search_string
<re.Match object; span=(5, 26), match='May 9 02:47:40.345257'>
>>> search_string.group()
'May 9 02:47:40.345257'
>>> search_string = regex.search(syslog_msg_6)
>>> search_string
<re.Match object; span=(5, 27), match='May  9 02:47:40.345257'>
>>> search_string.group()
'May  9 02:47:40.345257'
>>> 
admin@bjw-can-7060-1:~$ 
admin@bjw-can-7060-1:~$ date -d 'May 29 02:47:40.345257' +%s%3N
1748486860345
admin@bjw-can-7060-1:~$ date -d 'May 9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ date -d 'May  9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ date -d 'May 29 02:47:40.345257' +%s%3N
1748486860345
admin@bjw-can-7060-1:~$ date -d 'May 9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$ date -d 'May  9 02:47:40.345257' +%s%3N
1746758860345
admin@bjw-can-7060-1:~$
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

/azp run

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

Original PR: #16897

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit ecacbdb into sonic-net:202411 Feb 12, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants