[checkmk-commits] Structured data: Removed dead code

Module: check_mk Branch: master Commit: b9ad91c00f0bb1ef91932d68a8e324c34104af05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9ad91c00f0bb1… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Thu Nov 22 05:55:36 2018 +0100 Structured data: Removed dead code Change-Id: I83682fa5077541dbc6e8e81660c5a549020f7a47 --- cmk/structured_data.py | 13 -- .../cmk/structured_data/test_structured_data.py | 135 --------------------- 2 files changed, 148 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 606972a..4e3611c 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -34,19 +34,6 @@ import pprint import cmk.store as store from cmk.exceptions import MKGeneralException -# TODO add type annotations for mypy -# Example: -# def f(): -# # type: () -> bool -# """DOCSTRING""" -# ... do something -# return True -# def g(x): -# # type: (int) -> int -# """DOCSTRING""" -# ... do something -# return x*x - # ____ ____ # / \ / \ max. 1 per type # | SD | -------> | NA | ------------------------. diff --git a/tests/unit/cmk/structured_data/test_structured_data.py b/tests/unit/cmk/structured_data/test_structured_data.py index d0f19b5..602ab3f 100644 --- a/tests/unit/cmk/structured_data/test_structured_data.py +++ b/tests/unit/cmk/structured_data/test_structured_data.py @@ -553,138 +553,3 @@ def test_delta_structured_data_tree_serialization(two_tree_filenames): new_raw_delta_tree = new_delta_tree.get_raw_tree() assert raw_delta_tree == new_raw_delta_tree - - -#. -# .--Performance---------------------------------------------------------. -# | ____ __ | -# | | _ \ ___ _ __ / _| ___ _ __ _ __ ___ __ _ _ __ ___ ___ | -# | | |_) / _ \ '__| |_ / _ \| '__| '_ ` _ \ / _` | '_ \ / __/ _ \ | -# | | __/ __/ | | _| (_) | | | | | | | | (_| | | | | (_| __/ | -# | |_| \___|_| |_| \___/|_| |_| |_| |_|\__,_|_| |_|\___\___| | -# | | -# '----------------------------------------------------------------------' - -#(a)pytest.mark.parametrize(&quot;trees,stats,entries,results&quot;ults", [ -# (("tree_old_large_ora_tablespaces", -# "tree_new_large_ora_tablespaces_fixed_len", -# "tree_new_large_ora_tablespaces_variable_len"), -# (1.2, 0.5, 0.002), -# (82523, 82523, 82517), -# ((0, 16272, 0), (16270, 0, 16272)), -# ), -#]) -#def test_structured_data_StructuredDataTree_performance(trees, stats, entries, results): -# tree_old_name, tree_new_fixed_name, tree_new_variable_name = trees -# time_loading_tree, time_delta_tree, time_count_entries = stats -# tree_old_entries, tree_new_fixed_entries, tree_new_variable_entries = entries -# compare_fixed_result, compare_variable_result = results -# -# # ---loading tree--------------------------------------------------------- -# -# #TODO testing -# start = time.clock() -# tree_old = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_old_name)) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #tree_old = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_old_name)) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_loading_tree -# -# #TODO testing -# start = time.clock() -# tree_new_fixed = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_fixed_name)) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #tree_new_fixed = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_fixed_name)) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_loading_tree -# -# #TODO testing -# start = time.clock() -# tree_new_variable = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_variable_name)) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #tree_new_variable = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_variable_name)) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_loading_tree -# -# # ---count entries-------------------------------------------------------- -# -# #TODO testing -# start = time.clock() -# entries_old = tree_old.count_entries() -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #entries_old = tree_old.count_entries() -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_count_entries -# assert tree_old_entries == entries_old -# -# #TODO testing -# start = time.clock() -# entries_new_fixed = tree_new_fixed.count_entries() -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #entries_new_fixed = tree_new_fixed.count_entries() -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_count_entries -# assert tree_new_fixed_entries == entries_new_fixed -# -# #TODO testing -# start = time.clock() -# entries_new_variable = tree_new_variable.count_entries() -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #entries_new_variable = tree_new_variable.count_entries() -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_count_entries -# assert tree_new_variable_entries == entries_new_variable -# -# # ---delta tree computation----------------------------------------------- -# -# #TODO testing -# start = time.clock() -# n,c,r,d = tree_new_fixed.compare_with(tree_old) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #n,c,r,d = tree_new_fixed.compare_with(tree_old) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert compare_fixed_result == (n,c,r) -# assert run_time < time_delta_tree -# -# #TODO testing -# start = time.clock() -# n,c,r,d = tree_new_variable.compare_with(tree_old) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #n,c,r,d = tree_new_variable.compare_with(tree_old) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert compare_variable_result == (n,c,r) -# assert run_time < time_delta_tree -# -##.