Module: check_mk Branch: master Commit: f7eb9805b86b77cb9c1d03fc9cf2c7ffbd0cdf5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7eb9805b86b77… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 13 18:34:55 2017 +0100 test_statgrab_cpu_check: Remove unnecessary argument timepoints This level of generality is excessive at this point. We really only need to initialize all counters and get one 'real' result. Change-Id: Ica69b993552490a0e57e10bdf0b22637db091030 --- tests/checks/test_statgrab_cpu_check.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index 71a7460..9f4cc21 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -5,8 +5,8 @@ from cmk_base.check_api import MKCounterWrapped pytestmark = pytest.mark.checks -@pytest.mark.parametrize("timepoints,time_to_info,params,expected_results", [ -([60],lambda t: [[u'ctxsw', u'%d' % int(t*50)], +(a)pytest.mark.parametrize("time_to_info,params,expected_result"sult", [ +(lambda t: [[u'ctxsw', u'%d' % int(t*50)], [u'idle', u'%d' % int(t*50)], [u'intrs', u'%d' % int(t*50)], [u'iowait', u'%d' % int(t*50)], @@ -22,13 +22,12 @@ pytestmark = pytest.mark.checks [u'vctxsw', u'%d' % int(t*50)]], {}, None), ]) -def test_statgrab_cpu_check(check_manager, monkeypatch, timepoints, time_to_info, params, expected_results): +def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, expected_result): import time check = check_manager.get_check("statgrab_cpu") try: result = list(check.run_check(None, params, time_to_info(0))) except MKCounterWrapped: pass - for t in timepoints: - monkeypatch.setattr("time.time", lambda: t) - result = list(check.run_check(None, params, time_to_info(t))) + monkeypatch.setattr("time.time", lambda: 60) + result = list(check.run_check(None, params, time_to_info(60)))