[checkmk-commits] Replace 'default' placeholder in some generic tests

Module: check_mk Branch: master Commit: f6a7ee2a2f7ebb7dd26209f01e54d44ae3c9aca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6a7ee2a2f7ebb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Dec 14 13:12:10 2018 +0100 Replace 'default' placeholder in some generic tests Replace all 'default' placeholders which belong to a global variable defined in the checks by the actual value. Change-Id: Ic9e672d30ab0ea3567f88226eafd9e910e5cb5d2 --- .../datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py | 4 ++-- .../datasets/dotnet_clrmemory_server_windows_14_regression.py | 4 ++-- .../dotnet_clrmemory_server_windows_dotnet_regression.py | 4 ++-- .../dotnet_clrmemory_server_windows_interfaces_regression.py | 4 ++-- ...dotnet_clrmemory_server_windows_kaspersky_error_regression.py | 4 ++-- .../checks/generictests/datasets/hp_msa_volume_regression.py | 2 +- .../unit/checks/generictests/datasets/lparstat_aix_regression.py | 4 ++-- tests/unit/checks/generictests/datasets/vms_cpu_regression.py | 8 ++++---- tests/unit/checks/generictests/run.py | 9 ++++++--- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py index 9c0906d..add7817 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_hp_proliant_win_5_regression.py @@ -669,7 +669,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '2.54% time in GC', - [('percent', 2.5363462051694157, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 2.5363462051694157, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py index 8b7b3b7..e4052a1 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_14_regression.py @@ -174,7 +174,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '8.78% time in GC', - [('percent', 8.778833599942464, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 8.778833599942464, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py index e54f2dd..90257c0 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_dotnet_regression.py @@ -867,7 +867,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '1.84% time in GC', - [('percent', 1.8385322768796544, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 1.8385322768796544, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py index fc8c281..0021970 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_interfaces_regression.py @@ -504,7 +504,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '4.08% time in GC', - [('percent', 4.082020000573718, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 4.082020000573718, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py index b88cb1e..813b672 100644 --- a/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py +++ b/tests/unit/checks/generictests/datasets/dotnet_clrmemory_server_windows_kaspersky_error_regression.py @@ -240,7 +240,7 @@ discovery = {'': [(u'_Global_', 'dotnet_clrmemory_defaultlevels')]} checks = {'': [(u'_Global_', - 'default', + {"upper": (10.0, 15.0)}, [(0, '0.07% time in GC', - [('percent', 0.06994060242314372, None, None, 0, 100)])])]} \ No newline at end of file + [('percent', 0.06994060242314372, 10.0, 15.0, 0, 100)])])]} diff --git a/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py b/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py index 0143994..cbe6b11 100644 --- a/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py +++ b/tests/unit/checks/generictests/datasets/hp_msa_volume_regression.py @@ -80,7 +80,7 @@ checks = { ('growth', 0.0, None, None, None, None), ('trend', 0, None, None, 0, 17481)])]) ], - 'io': [('SUMMARY', 'default', [ + 'io': [('SUMMARY', {}, [ (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0, None, None, None, None)]), (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0, None, None, None, None)]), ])] diff --git a/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py b/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py index 8e5f951..6b1933e 100644 --- a/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py +++ b/tests/unit/checks/generictests/datasets/lparstat_aix_regression.py @@ -8,14 +8,14 @@ discovery = { } checks = { - '': [(None, 'default', + '': [(None, None, [(0, 'Physc: 0.02, Entc: 9.3%, Lbusy: 0.1, App: 519, Vcsw: 0, Phint: 101, Nsp: 0.00%', [('physc', 0.02, None, None, None, None), ('entc', 9.3, None, None, None, None), ('lbusy', 0.1, None, None, None, None), ('app', 519.0, None, None, None, None), ('vcsw', 0.0, None, None, None, None), ('phint', 101.0, None, None, None, None), ('nsp', 0.0, None, None, None, None)])])], 'cpu_util': [ - (None, 'default', [(0, 'user: 0.2%, system: 1.2%, wait: 0.2%', + (None, None, [(0, 'user: 0.2%, system: 1.2%, wait: 0.2%', [('user', 0.2, None, None, None, None), ('system', 1.2, None, None, None, None), ('wait', 0.2, None, None, None, None)])]), diff --git a/tests/unit/checks/generictests/datasets/vms_cpu_regression.py b/tests/unit/checks/generictests/datasets/vms_cpu_regression.py index f0f9f00..e2a78fa 100644 --- a/tests/unit/checks/generictests/datasets/vms_cpu_regression.py +++ b/tests/unit/checks/generictests/datasets/vms_cpu_regression.py @@ -6,10 +6,10 @@ discovery = {'': [(None, 'vms_cpu_default_levels')]} checks = { '': [ - (None, 'default', [(0, 'user: 0.5%, system: 0.1%, wait: 0.2%', - [('user', 0.54, None, None, None, None), - ('system', 0.10999999999999827, None, None, None, None), - ('wait', 0.18, 0, 0, None, None)])]), + (None, None, [(0, 'user: 0.5%, system: 0.1%, wait: 0.2%', + [('user', 0.54, None, None, None, None), + ('system', 0.10999999999999827, None, None, None, None), + ('wait', 0.18, 0, 0, None, None)])]), (None, (0.1, 0.5), [(1, 'user: 0.5%, system: 0.1%, wait: 0.2%', [('user', 0.54, None, None, None, None), ('system', 0.10999999999999827, None, None, None, None), diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 7b5c17c..d10990b 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -46,8 +46,9 @@ def get_discovered_merged_parameters(check, provided_p): if not provided_p: return default_p, "default" if isinstance(provided_p, str): - # TODO: this is not correct since it may be the name of a variable defined in - # the check or the repr of a dict as e.g. in winperf_if + if provided_p in check.context: + return check.context[provided_p], check.context[provided_p] + # TODO: the repr case used e.g. in winperf_if is still not correct return default_p, "default" raise DiscoveryParameterTypeError("unhandled: %r/%r" % (default_p, provided_p)) @@ -57,7 +58,9 @@ def get_check_merged_parameters(check, provided_p): if provided_p == 'default': return default_p - if isinstance(default_p, dict) and isinstance(provided_p, dict): + if provided_p is None: + return provided_p + if isinstance(provided_p, dict): default_p.update(provided_p) return default_p if isinstance(provided_p, tuple):