[checkmk-commits] [CMK-1912] - integration test is adopted to new output from WMI

Module: check_mk Branch: master Commit: bcd6a090c3e6b30ac29e2639f4fb6bcd4de33fc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd6a090c3e6b3… Author: Sergey Kipnis &lt;sk(a)mathias-kettner.de&gt; Date: Mon Apr 1 15:45:00 2019 +0200 [CMK-1912] - integration test is adopted to new output from WMI Change-Id: Icb9d87d60265918a817f1b320acd715aa926fe29 --- agents/windows/it/test_section_wmi_cpuload.py | 8 ++++---- agents/windows/it/test_section_wmi_webservices.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/windows/it/test_section_wmi_cpuload.py b/agents/windows/it/test_section_wmi_cpuload.py index d97f9c9..93a56bd 100644 --- a/agents/windows/it/test_section_wmi_cpuload.py +++ b/agents/windows/it/test_section_wmi_cpuload.py @@ -40,9 +40,9 @@ def expected_output(): r'Frequency_PerfTime,Frequency_Sys100NS,Name,' r'PercentRegistryQuotaInUse,PercentRegistryQuotaInUse_Base,Processes,' r'ProcessorQueueLength,SystemCallsPersec,SystemUpTime,Threads,' - r'Timestamp_Object,Timestamp_PerfTime,Timestamp_Sys100NS'), + r'Timestamp_Object,Timestamp_PerfTime,Timestamp_Sys100NS,WMIStatus'), (r'\d+,,\d+,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,,\d+,' - r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+'), + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\b(?:OK|Timeout)\b'), re.escape(r'[computer_system]'), (r'AdminPasswordStatus,AutomaticManagedPagefile,' r'AutomaticResetBootOption,AutomaticResetCapability,BootOptionOnLimit,' @@ -61,11 +61,11 @@ def expected_output(): r'ResetLimit,Roles,Status,SupportContactDescription,SystemFamily,' r'SystemSKUNumber,SystemStartupDelay,SystemStartupOptions,' r'SystemStartupSetting,SystemType,ThermalState,TotalPhysicalMemory,' - r'UserName,WakeUpType,Workgroup'), + r'UserName,WakeUpType,Workgroup,WMIStatus'), (r'\d+,\d+,\d+,\d+,\d*,\d*,\d+,[^,]*,[^,]+,[\w-]+,\d+,,\w+,\d+,\d+,' r'[^,]+,[\w-]+,[^,]+,\d+,\d+,\d+,\d+,\d+,,,\d+,,[^,]+(, [^,]+)?,[^,]+,' r'[\w-]+,,\d+,\d+,\d+,,[^,]+,\d+,\-?\d+,\d+,\d+,,,\d+,\d+,\d+,,[\w-]+,' - r'\d+,\d+,\d+,[^,]+,\w+,,[^,]*,,,,,[^,]+,\d+,\d+,[^,]*,\d+,\w*') + r'\d+,\d+,\d+,[^,]+,\w+,,[^,]*,,,,,[^,]+,\d+,\d+,[^,]*,\d+,\w*,\b(?:OK|Timeout)\b') ] if not Globals.alone: expected += [re.escape(r'<<<systemtime>>>'), r'\d+'] diff --git a/agents/windows/it/test_section_wmi_webservices.py b/agents/windows/it/test_section_wmi_webservices.py index 1baee4d..09dfb78 100644 --- a/agents/windows/it/test_section_wmi_webservices.py +++ b/agents/windows/it/test_section_wmi_webservices.py @@ -40,7 +40,7 @@ def expected_output(): r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,[^,]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+') + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\b(?:OK|Timeout)\b') if not Globals.alone: re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' re_str += r'$' @@ -87,7 +87,7 @@ def expected_output(): r'TotalPropfindRequests,TotalProppatchRequests,TotalPutRequests,' r'TotalRejectedAsyncIORequests,TotalSearchRequests,' r'TotalTraceRequests,TotalUnlockRequests,TraceRequestsPersec,' - r'UnlockRequestsPersec') + r'UnlockRequestsPersec,WMIStatus') ], repeat(re_str))