[checkmk-commits] check_levels: don't put a space before '%' unit.

Module: check_mk Branch: master Commit: 469948cde08db676939d52f0cbb6e55107dc8518 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=469948cde08db6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 9 07:50:37 2019 +0100 check_levels: don't put a space before '%' unit. Change-Id: I1aeb59dcb7fb80ac199fb2d4d0f9427974cc537a --- cmk_base/check_api.py | 2 +- tests/unit/checks/test_diskstat.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 146b356..e5ea7c0 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -384,7 +384,7 @@ def check_levels(value, the value. It has priority over the unit argument. infoname: Perf value name for infotext, defaults to dsname """ - if unit: + if unit not in ('', '%'): unit = " " + unit # Insert space before MB, GB, etc. if human_readable_func is None: diff --git a/tests/unit/checks/test_diskstat.py b/tests/unit/checks/test_diskstat.py index 6cefc22..299263d 100644 --- a/tests/unit/checks/test_diskstat.py +++ b/tests/unit/checks/test_diskstat.py @@ -32,7 +32,7 @@ pytestmark = pytest.mark.checks 'average_write_request_size': 0.0, 'queue_length': 0.0, } - }, [(0, 'Utilization: 0.00 %', [('disk_utilization', 0.0)]), + }, [(0, 'Utilization: 0.00%', [('disk_utilization', 0.0)]), (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0)]), (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0)]), (0, 'Average Wait: 0.00 ms', [('wait', 0.0)]), @@ -72,7 +72,7 @@ pytestmark = pytest.mark.checks 'average_write_request_size': 0.0, 'queue_length': 0.0, } - }, [(0, 'Utilization: 0.00 %', [('disk_utilization', 0.0)]), + }, [(0, 'Utilization: 0.00%', [('disk_utilization', 0.0)]), (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0)]), (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0)]), (0, 'Average Wait: 0.00 ms', [('wait', 0.0)]),