Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

Refactoring table: removed unused odd even.

by Roland Halbig

Module: check_mk Branch: master Commit: 58a39ef5897b2de0a6ea73e5bbcf0d67e885d732 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58a39ef5897b2d… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Mar 7 17:51:27 2017 +0100 Refactoring table: removed unused odd even. Change-Id: Id82874844119360c03f5a6b3f843beafa5e85bf0 --- web/htdocs/table.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 31398c4..dd596f2 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -331,7 +331,6 @@ class Table(object): html.end_form() html.close_tr() - odd = "even" for nr, (row, css, state, fixed) in enumerate(rows): # Intermediate header if state == "header": @@ -345,11 +344,9 @@ class Table(object): html.close_td() html.close_tr() - odd = "even" self._render_headers(actions_enabled, actions_visible) continue - odd = "even" if odd == "odd" else "odd" html.open_tr(class_=["data", "odd%d" % state, css if css else None]) for cell_content, css_classes, colspan in row: html.open_td(class_=css_classes if css_classes else None, colspan=colspan if colspan else None) @@ -383,7 +380,6 @@ class Table(object): if not omit_headers and self.rows and self.rows[0][2] != "header": html.write(csv_separator.join([html.strip_tags(header) or "" for (header, css, help, sortable) in headers]) + "\n") - odd = "even" for nr, (row, css, state, fixed) in enumerate(rows): html.write(csv_separator.join([html.strip_tags(cell_content) for cell_content, css_classes, colspan in row ])) html.write("\n")

7 years, 6 months

4486 FIX avaya_88xx, avaya_88xx_cpu: fixed invalid data handling, ie. ValueError: invalid literal for int() with base 10: ''

by Simon Betz

Module: check_mk Branch: master Commit: 40c80ae73479d4804d7516ceb34ef8e9df781f2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40c80ae73479d4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 7 15:40:07 2017 +0100 4486 FIX avaya_88xx, avaya_88xx_cpu: fixed invalid data handling, ie. ValueError: invalid literal for int() with base 10: '' Change-Id: Ie08254b9b99b2560aaa7884bd87022e23c3daf23 --- .werks/4486 | 11 +++++++++++ checks/avaya_88xx | 9 +++++++-- checks/avaya_88xx_cpu | 7 ++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/4486 b/.werks/4486 new file mode 100644 index 0000000..403b4ce --- /dev/null +++ b/.werks/4486 @@ -0,0 +1,11 @@ +Title: avaya_88xx, avaya_88xx_cpu: fixed invalid data handling, ie. ValueError: invalid literal for int() with base 10: '' +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488897554 + + diff --git a/checks/avaya_88xx b/checks/avaya_88xx index f084bd4..a932e97 100644 --- a/checks/avaya_88xx +++ b/checks/avaya_88xx @@ -29,6 +29,7 @@ def parse_avaya_88xx(info): for line in info: parsed["fanstate"].append(line[0]) parsed["temp"].append(line[1]) + return parsed def inventory_avaya_88xx_fan(parsed): @@ -58,14 +59,18 @@ factory_settings["avaya_88xx_default_levels"] = { def inventory_avaya_88xx(parsed): sensors = parsed["temp"] for idx, temp in enumerate(sensors): - yield str(idx), {} +# if temp: + yield str(idx), {} def check_avaya_88xx(item, params, parsed): sensors = parsed["temp"] if len(sensors) < int(item): return - return check_temperature(int(sensors[int(item)]), params, "avaya_88xx_%s" % item) + reading = sensors[int(item)] + if reading: + return check_temperature(int(reading), params, "avaya_88xx_%s" % item) + check_info["avaya_88xx"] = { 'parse_function': parse_avaya_88xx, diff --git a/checks/avaya_88xx_cpu b/checks/avaya_88xx_cpu index fe614f0..cab64b8 100644 --- a/checks/avaya_88xx_cpu +++ b/checks/avaya_88xx_cpu @@ -29,14 +29,16 @@ factory_settings["avaya_88xx_cpu_default_levels"] = { "levels" : (90, 95), } + def inventory_avaya_88xx_cpu(info): return [(None, {})] + def check_avaya_88xx_cpu(_no_item, params, info): if not info: return + return check_cpu_util(int(info[0][0]), params, time.time()) - return check_cpu_util(int(info[0][1]), params, time.time()) check_info["avaya_88xx_cpu"] = { 'check_function': check_avaya_88xx_cpu, @@ -45,8 +47,7 @@ check_info["avaya_88xx_cpu"] = { 'default_levels_variable': "avaya_88xx_cpu_default_levels", 'group': 'cpu_utilization', 'has_perfdata': True, - # RAPID-CITY MIB - 'snmp_info': ( ".1.3.6.1.4.1.2272.1.1", [ 13, 20, 21, 41, 47 ]), # rcSysCpuUtil + 'snmp_info': ( ".1.3.6.1.4.1.2272.1.1", [ 20 ]), # RAPID-CITY MIB::rcSysCpuUtil 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.2272" in oid(".1.3.6.1.2.1.1.2.0"), 'includes': [ 'cpu_util.include' ], }

7 years, 6 months

refactoring ucd and hr checks

by Marcel Arentz

Module: check_mk Branch: master Commit: 439f38b98c5f96c6ef6a0b89a70cf3f3a6873c79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439f38b98c5f96… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 6 15:00:47 2017 +0100 refactoring ucd and hr checks avoiding processing the scan in several places especially for mem check. Additionally made name of the regular scan function more descriptive Change-Id: I0d90527253a575168a141422fa8945f9cb2cd569 --- checks/hr_mem | 21 +++++++++++---------- checks/ucd.include | 16 +++++++++++++++- checks/ucd_cpu_util | 16 ++++++++-------- checks/ucd_disk | 8 ++++---- checks/ucd_mem | 11 ++++++----- checks/ucd_processes | 2 +- 6 files changed, 45 insertions(+), 29 deletions(-) diff --git a/checks/hr_mem b/checks/hr_mem index 0a78ecc..8bc2c3a 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -102,20 +102,21 @@ def check_hr_mem(_no_item, params, info): return (3, "Invalid information. Total memory is empty.") check_info["hr_mem"] = { - 'check_function': check_hr_mem, - 'inventory_function': inventory_hr_mem, - 'service_description': 'Memory used', - 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.2.1.25.2.3.1', [ + 'inventory_function' : inventory_hr_mem, + 'check_function' : check_hr_mem, + 'service_description' : 'Memory used', + 'has_perfdata' : True, + 'snmp_info' : ('.1.3.6.1.2.1.25.2.3.1', [ 2, # hrStorageType 3, # hrStorageDescr 4, # hrStorageAllocationUnits 5, # hrStorageSize 6, # hrStorageUsed ]), - # HOST-RESOURCES-MIB::hrSystemUptime.0 - 'snmp_scan_function': lambda oid: \ - not not oid('.1.3.6.1.2.1.25.1.1.0') and - "pfsense" not in oid(".1.3.6.1.2.1.1.1.0").lower(), - 'group': 'memory', + # Some devices are reporting wrong data on + # HOST-RESOURCES-MIB. Use UCD-MIB in these + # cases instead + 'snmp_scan_function' : hr_mem_scan_function, + 'group' : 'memory', + 'includes' : [ "ucd.include" ] } diff --git a/checks/ucd.include b/checks/ucd.include index 3c7eb6f..7ec70db 100644 --- a/checks/ucd.include +++ b/checks/ucd.include @@ -37,6 +37,7 @@ def ucd_scan_function(oid): "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ # for barracuda spam firewall appliance "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ "genugate" in oid(".1.3.6.1.2.1.1.1.0") or \ # for artec email archiv appliance ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ @@ -44,9 +45,22 @@ def ucd_scan_function(oid): "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) -def prefer_hr_scan_function(oid): +def avoid_ucd_scan_function(oid): # We prefer HOST-RESOURCES-MIB implementation but not in case # of check 'ucd_cpu_load' because the HR-MIB has not data # about cpu load return ucd_scan_function(oid) and \ not oid(".1.3.6.1.2.1.25.1.1.0") + +def hr_mem_scan_function(oid): + # We prefer HOST-RESOURCES-MIB implementation but not in case + # of devices, which are known to report incorrect information + # about mem usage + return not "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + (oid(".1.3.6.1.2.1.25.1.1.0") and \ + not ucd_scan_function(oid)) + +def ucd_mem_scan_function(oid): + # Avoid inverting output of a function in a check plugin and be + # descriptive about what a function is actually doing + return not hr_mem_scan_function(oid) diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 591c553..a94e0cf 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -83,12 +83,12 @@ def check_ucd_cpu_util(item, params, info): check_info["ucd_cpu_util"] = { - 'check_function': check_ucd_cpu_util, - 'inventory_function': inventory_ucd_cpu_util, - 'service_description': 'CPU utilization', - 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.4.1.2021.11', [50, 51, 52, 53, 54, 55, 56]), - 'snmp_scan_function': prefer_hr_scan_function, - 'includes': [ "ucd.include" ], - 'group': 'cpu_iowait', + 'inventory_function' : inventory_ucd_cpu_util, + 'check_function' : check_ucd_cpu_util, + 'service_description' : 'CPU utilization', + 'has_perfdata' : True, + 'snmp_info' : ('.1.3.6.1.4.1.2021.11', [50, 51, 52, 53, 54, 55, 56]), + 'snmp_scan_function' : avoid_ucd_scan_function, + 'includes' : [ "ucd.include" ], + 'group' : 'cpu_iowait', } diff --git a/checks/ucd_disk b/checks/ucd_disk index b97ed6d..e47f7be 100644 --- a/checks/ucd_disk +++ b/checks/ucd_disk @@ -47,11 +47,11 @@ check_info['ucd_disk'] = { 'service_description' : 'Filesystem %s', 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.2021.9.1", [ - "2", # dskPath -> where the disk is mounted. - "6", # dskTotal -> in kBytes - "7", # dskAvail -> in kBytes + "2", # dskPath -> where the disk is mounted. + "6", # dskTotal -> in kBytes + "7", # dskAvail -> in kBytes ]), - 'snmp_scan_function' : prefer_hr_scan_function, + 'snmp_scan_function' : avoid_ucd_scan_function, "group" : "filesystem", 'default_levels_variable' : "filesystem_default_levels", 'includes' : [ "ucd.include", "df.include" ], diff --git a/checks/ucd_mem b/checks/ucd_mem index 4cca376..3246ab2 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -55,12 +55,13 @@ check_info['ucd_mem'] = { 'service_description' : 'Memory', 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.2021.4", [ - "5", # memTotal -> kB - "6", # memAvailable -> kB + "5", # memTotal -> kB + "6", # memAvailable -> kB ]), - 'snmp_scan_function' : lambda oid: \ - "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - prefer_hr_scan_function(oid), + # Some devices are reporting wrong data on + # HOST-RESOURCES-MIB. Use UCD-MIB in these + # cases instead + 'snmp_scan_function' : ucd_mem_scan_function, 'default_levels_variable' : 'ucd_mem_default_levels', 'group' : 'memory_simple', 'includes' : [ "ucd.include", "memory.include" ], diff --git a/checks/ucd_processes b/checks/ucd_processes index 63ca9e8..68da7bd 100644 --- a/checks/ucd_processes +++ b/checks/ucd_processes @@ -83,6 +83,6 @@ check_info['ucd_processes'] = { "100", # prErrFlag "101", # prErrMessage ]), - 'snmp_scan_function' : prefer_hr_scan_function, + 'snmp_scan_function' : avoid_ucd_scan_function, 'includes' : [ "ucd.include" ], }

7 years, 6 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: a4bd33a38d62afde92d7122b1721512d9c662668 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4bd33a38d62af… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 7 15:39:00 2017 +0100 Reserved 10 Werk IDS Change-Id: Icccad9f56a231dd5ad80cd9e6c5be7cf32d17653 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bef67d6..eec95d2 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4486 +4496

7 years, 6 months

Combined graphs: Moving AutomaticDict from global lib to web/htdocs/ metrics.py

by Andreas Umbreit

Module: check_mk Branch: master Commit: 1ff3d7c9d97863f0ad7518ac2c7deaba7be8bf23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff3d7c9d97863… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Mar 7 14:33:19 2017 +0100 Combined graphs: Moving AutomaticDict from global lib to web/htdocs/metrics.py --- lib/containers.py | 48 ------------------------------------------------ web/htdocs/metrics.py | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 49 deletions(-) diff --git a/lib/containers.py b/lib/containers.py deleted file mode 100644 index f8ae783..0000000 --- a/lib/containers.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# tails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -# This file contains special containers needed for data representation - -from collections import OrderedDict - -# Dictionary class with the ability of appending items like provided -# by a list. -class AutomaticDict(OrderedDict): - - def __init__(self, list_identifier = None, start_index = None): - OrderedDict.__init__(self) - self._list_identifier = list_identifier or "item" - self._item_index = start_index or 0 - - def __getitem__(self, item): - if item in self.keys(): - return OrderedDict.__getitem__(self, item) - else: - return self["%s_%i" %(self._list_identifier, item)] - - def append(self, item): - self["%s_%i" %(self._list_identifier, self._item_index)] = item - self._item_index += 1 diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index f300256..70ce4d6 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -43,7 +43,6 @@ from lib import * from valuespec import * import livestatus from cmk.regex import regex -from cmk.containers import AutomaticDict try: import simplejson as json @@ -63,6 +62,22 @@ except ImportError: # Datastructures and functions needed before plugins can be loaded loaded_with_language = False + +# Dictionary class with the ability of appending items like provided +# by a list. +class AutomaticDict(OrderedDict): + + def __init__(self, list_identifier = None, start_index = None): + OrderedDict.__init__(self) + self._list_identifier = list_identifier or "item" + self._item_index = start_index or 0 + + + def append(self, item): + self["%s_%i" %(self._list_identifier, self._item_index)] = item + self._item_index += 1 + + def load_plugins(force): global loaded_with_language if loaded_with_language == current_language and not force:

7 years, 6 months

4425 FIX Fixed issue in WATO rule analayzer with negated host conditions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b4e0971c2a6321e12c45d6a995ecb05b6d16142 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b4e0971c2a632… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 13:38:09 2017 +0100 4425 FIX Fixed issue in WATO rule analayzer with negated host conditions Change-Id: I043ab1ca83364a9db343bfbd7b8ba2aaa4951fe4 --- .werks/4425 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4425 b/.werks/4425 new file mode 100644 index 0000000..086d876 --- /dev/null +++ b/.werks/4425 @@ -0,0 +1,10 @@ +Title: Fixed issue in WATO rule analayzer with negated host conditions +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488890260 +Class: fix + +

7 years, 6 months

Updated bug entries #2527

by Lars Michelsen

Module: check_mk Branch: master Commit: 5be709cc92ec679050887be8c3871448151df9ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be709cc92ec67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 13:08:15 2017 +0100 Updated bug entries #2527 Change-Id: I7b4f460b7a4148eb5a7c4b484c90e8dffce6e8ad --- .bugs/2527 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/2527 b/.bugs/2527 index b0a5b35..fd6b2dc 100644 --- a/.bugs/2527 +++ b/.bugs/2527 @@ -1,9 +1,9 @@ Title: Fix broken rule evaluation when using multiple negated hosts Component: checks -State: open +Class: bug +State: done Date: 2016-11-09 14:46:05 Targetversion: future -Class: bug The functions wato.py:rule_matches_host_and_item and modules/check_mk.py:in_extraconf_hostlist can not handle these kind of hostlist ['!heute1', '!heute', '!heute2', '@all'] @@ -16,3 +16,7 @@ Replay issue: 2) Setup hosts as mentioned in the example above 3) Navigate to "Parameters of {hostname}" Host heute matches, Host heute1 does not match + +2017-03-07 13:08:12: changed state open -> done +The problem could only be found in WATO rule analyzer. modules/check_mk.py:in_extraconf_hostlist +is working as expected.

7 years, 6 months

Fix for recent change of WATO rule analyzer

by Lars Michelsen

Module: check_mk Branch: master Commit: b1f4c43753120d14ba2ad7b9ddf4f8103f461553 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f4c43753120d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 12:57:41 2017 +0100 Fix for recent change of WATO rule analyzer Change-Id: I022ebc747604beb375e58a8af2304d99c6ce271e --- web/htdocs/watolib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index bbaca75..c3f9521 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6971,7 +6971,7 @@ class Rule(object): for check_host in self.host_list: if check_host == "@all": - return not negate + return True if check_host[0] == '!': # strip negate character check_host = check_host[1:] @@ -6988,7 +6988,7 @@ class Rule(object): elif regex_match and regex(check_host).match(hostname): return not negate - return not negate + return negate

7 years, 6 months

Try to fix bug #2527

by Mathias Kettner

Module: check_mk Branch: master Commit: b57350c265f0e53fb637fc22160e016870c13038 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b57350c265f0e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 7 12:07:03 2017 +0100 Try to fix bug #2527 Change-Id: I4a64b847a9fa37399ae8fdabd2184f49df7c959f --- modules/check_mk.py | 1 - web/htdocs/watolib.py | 36 +++++++++++++++--------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 10ce0f7..5b41a29 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1101,7 +1101,6 @@ def in_extraconf_hostlist(hostlist, hostname): hostentry = hostentry[1:] use_regex = True - hostentry = hostentry try: if not use_regex and hostname == hostentry: return not negate diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 36fc386..bbaca75 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6962,40 +6962,34 @@ class Rule(object): def _matches_hostname(self, hostname): - negate = False - regex_match = False - hostname_match = False + if not self.host_list: + return False # empty list of explicit host does never match + + # Assume WATO conforming rule where either *all* or *none* of the + # host expressions are negated. + negate = self.host_list[0].startswith("!") for check_host in self.host_list: - if check_host == "@all" or hostname == check_host: - hostname_match = True - break + if check_host == "@all": + return not negate - if check_host[0] == '!': + if check_host[0] == '!': # strip negate character check_host = check_host[1:] - negate = True + if check_host[0] == '~': check_host = check_host[1:] regex_match = True + else: + regex_match = False if not regex_match and hostname == check_host: - if negate: - break - hostname_match = True - break + return not negate elif regex_match and regex(check_host).match(hostname): - if negate: - break - hostname_match = True - break + return not negate - # No Match until now, but negate, so thats a match - if negate: - hostname_match = True - break + return not negate - return hostname_match def matches_item(self, item):

7 years, 6 months

Tests: Removed redundant function argument.

by Roland Halbig

Module: check_mk Branch: master Commit: 36a2e3c9ad1dbf0e41485b549e023ebd70a76df8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36a2e3c9ad1dbf… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Mar 7 11:29:09 2017 +0100 Tests: Removed redundant function argument. Change-Id: I9a3e61d003d52c2fa7431b1004154f97450cb8be --- tests/web/test_table.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 85437aa..9af7ada 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -189,7 +189,7 @@ def test_groupheader(): print bcolors.WARNING + "TODO" -def test_table_wrapper(monkeypatch, tmpdir): +def test_table_wrapper(monkeypatch): import config monkeypatch.setattr(config, "save_user_file", save_user_mock) @@ -199,11 +199,11 @@ def test_table_wrapper(monkeypatch, tmpdir): for searchable in [True, False]: for limit in [None, 2]: for output_format in ["html", "csv"]: - passed, emsg = table_test_cubical(sortable, searchable, limit, output_format, tmpdir) + passed, emsg = table_test_cubical(sortable, searchable, limit, output_format) assert passed, emsg -def table_test_cubical(sortable, searchable, limit, output_format, tmpdir): +def table_test_cubical(sortable, searchable, limit, output_format): import table html = TableTester()

7 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017