[checkmk-commits] Win-agent: test section plugin group followed by systemtime

Module: check_mk Branch: master Commit: ac449544f0a29a5aa2bab3c48691ddd2500168c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac449544f0a29a… Author: Jukka Aro &lt;ja(a)mathias-kettner.de&gt; Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test section plugin group followed by systemtime Check that the plugin group section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the plugin group section. Change-Id: I02895ee28c93fee5db81d1cab58d46db806f12fc --- agents/windows/it/test_section_dotnet_clrmemory.py | 2 +- agents/windows/it/test_section_eventlog.py | 2 +- .../windows/it/test_section_openhardwaremonitor.py | 2 +- agents/windows/it/test_section_plugin_group.py | 52 +++++++++++++++------- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/agents/windows/it/test_section_dotnet_clrmemory.py b/agents/windows/it/test_section_dotnet_clrmemory.py index d9c353c..c7978e7 100644 --- a/agents/windows/it/test_section_dotnet_clrmemory.py +++ b/agents/windows/it/test_section_dotnet_clrmemory.py @@ -48,7 +48,7 @@ def expected_output(): r'[\w\#\.]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+') if not Globals.alone: - re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' return chain(base, repeat(re_str)) diff --git a/agents/windows/it/test_section_eventlog.py b/agents/windows/it/test_section_eventlog.py index 55feef7..ba5e501 100644 --- a/agents/windows/it/test_section_eventlog.py +++ b/agents/windows/it/test_section_eventlog.py @@ -148,7 +148,7 @@ def expected_output_application_events(): [logtitle(l) for l in logs[split_index:]] + [r'[CWOu\.] \w{3} \d{2} \d{2}\:\d{2}:\d{2} \d+\.\d+ .+ .+']) if not Globals.alone: - re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' return chain([re.escape(r'<<<%s>>>' % Globals.section)], [logtitle(l) for l in logs[:split_index]], [ r'W \w{3} \d{2} \d{2}\:\d{2}:\d{2} 0\.%d %s %s' % diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py index f060fbc..596fcd8 100644 --- a/agents/windows/it/test_section_openhardwaremonitor.py +++ b/agents/windows/it/test_section_openhardwaremonitor.py @@ -51,7 +51,7 @@ def expected_output(): re_str = (r'^\d+,[^,]+,(\/\w+)+,(Power|Clock|Load|Data|Temperature),' r'\d+\.\d{6}') if not Globals.alone: - re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' re_str += r'$' return chain([ re.escape(r'<<<openhardwaremonitor:sep(44)>>>'), diff --git a/agents/windows/it/test_section_plugin_group.py b/agents/windows/it/test_section_plugin_group.py index 8066c52..abcd829 100644 --- a/agents/windows/it/test_section_plugin_group.py +++ b/agents/windows/it/test_section_plugin_group.py @@ -35,23 +35,33 @@ def testconfig_suffixes(request, config): return config +(a)pytest.fixture(params=[&#39;alone&#39;one', 'with_systemtime']) +def testconfig_sections(request, testconfig_suffixes): + Globals.alone = request.param == 'alone' + if Globals.alone: + testconfig_suffixes.set('global', 'sections', Globals.plugintype) + else: + testconfig_suffixes.set('global', 'sections', + '%s systemtime' % Globals.plugintype) + return testconfig_suffixes + + @pytest.fixture(params=['sync', 'async', 'async+cached']) -def testconfig(request, testconfig_suffixes): +def testconfig(request, testconfig_sections): Globals.executionmode = request.param - testconfig_suffixes.set('global', 'sections', Globals.plugintype) - testconfig_suffixes.set('global', 'crash_debug', 'yes') + testconfig_sections.set('global', 'crash_debug', 'yes') if request.param != 'sync': - testconfig_suffixes.add_section(Globals.plugintype) - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.add_section(Globals.plugintype) + testconfig_sections.set(Globals.plugintype, 'execution %s' % Globals.pluginname, 'async') - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.set(Globals.plugintype, 'timeout %s' % Globals.pluginname, '10') if request.param == 'async+cached': - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.set(Globals.plugintype, 'cache_age %s' % Globals.pluginname, '300') - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.set(Globals.plugintype, 'retry_count %s' % Globals.pluginname, '3') - return testconfig_suffixes + return testconfig_sections @pytest.fixture() @@ -74,7 +84,7 @@ def expected_output(): if Globals.executionmode == 'async+cached' else r'') + re.escape(r'>>>'), r'^$' ] - netstat_pattern = ( + repeating_pattern = ( r'^$' r'|Aktive Verbindungen' r'|Active Connections' @@ -88,8 +98,10 @@ def expected_output(): r'|LISTENING|ESTABLISHED|TIME_WAIT|CLOSE_WAIT)' r'|\-?\d+( \d+)+ [\w\(\)]+') if Globals.plugintype == 'plugins': - netstat_pattern += r'|%s' % re.escape(r'<<<>>>') - plugin_variadic = repeat(netstat_pattern) + repeating_pattern += r'|%s' % re.escape(r'<<<>>>') + if not Globals.alone: + repeating_pattern += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' + plugin_variadic = repeat(repeating_pattern) elif Globals.pluginname == 'wmic_if.bat': plugin_fixed += [ re.escape(r'<<<') + r'winperf_if:sep\(44\)%s' % @@ -98,11 +110,14 @@ def expected_output(): re.escape(r'>>>'), r'^$', r'^$', r'Node,MACAddress,Name,NetConnectionID,NetConnectionStatus,Speed' ] - plugin_variadic = repeat( + re_variadic = ( r'[^,]+,([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5})?,[^,]+,[^,]*,\d*,\d*' - r'|^$' - r'%s' % (r'|%s' % re.escape(r'<<<>>>') - if Globals.plugintype == 'plugins' else '')) + r'|^$') + if Globals.plugintype == 'plugins': + re_variadic += r'|%s' % re.escape(r'<<<>>>') + if not Globals.alone: + re_variadic += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' + plugin_variadic = repeat(re_variadic) elif Globals.pluginname == 'windows_if.ps1': plugin_fixed += [ re.escape(r'<<<') + r'winperf_if:sep\(9\)%s' % @@ -114,7 +129,10 @@ def expected_output(): (r'[^\t]+\s+([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5})?\s+[^\t]+\s+[^\t]*' r'\s+\d*\s+\d*\s+\{[0-9A-F]+(\-[0-9A-F]+)+\}') ] - plugin_variadic = [] + plugin_variadic = [ + r'%s' % ('' if Globals.alone else + r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+') + ] return chain(main_label, plugin_fixed, plugin_variadic)