Test increasing and python standards embracing (#71)

* [fix] Fixed test_common.py unit test

* pep8 conventions WIP

Author: filipecosta90

poetry.lock

@@ -31,6 +31,7 @@ wget = "^3.2"
 pytest = "^4.6"
 pytest-cov = "^2.9.0"
 codecov = "^2.1.4"
+black = "^20.8b1"
 
 [build-system]
 requires = ["poetry>=0.12"]

pyproject.toml

@@ -22,7 +22,7 @@ def prepare_tags(k):
 
 
 def add_datapoint(
-        time_series_dict, broader_ts_name, start_time_ms, metric_value, tags_array
+    time_series_dict, broader_ts_name, start_time_ms, metric_value, tags_array
 ):
     if broader_ts_name not in time_series_dict:
         tags_dict = {}
@@ -66,22 +66,22 @@ def split_key_metrics_by_step(key_metrics_specs):
     return key_metrics_by_step
 
 
-def get_or_None(dict, property):
+def get_or_none(dict, property):
     result = None
     if property in dict:
         result = dict[property]
     return result
 
 
 def get_kv_tags(
-        deployment_type,
-        extra_tags_array,
-        git_sha,
-        project,
-        project_version,
-        results_type,
-        step,
-        testcase_name,
+    deployment_type,
+    extra_tags_array,
+    git_sha,
+    project,
+    project_version,
+    results_type,
+    step,
+    testcase_name,
 ):
     common_broader_kv_tags = [
         {"project": project},
@@ -113,14 +113,14 @@ def get_kv_tags(
 
 
 def get_metric_detail(key_metric_spec):
-    metric_step = get_or_None(key_metric_spec, "step")
-    metric_family = get_or_None(key_metric_spec, "metric-family")
-    metric_json_path = get_or_None(key_metric_spec, "metric-json-path")
-    metric_name = get_or_None(key_metric_spec, "metric-name")
-    metric_unit = get_or_None(key_metric_spec, "unit")
-    metric_type = get_or_None(key_metric_spec, "metric-type")
-    metric_comparison = get_or_None(key_metric_spec, "comparison")
-    metric_per_step_comparison_priority = get_or_None(
+    metric_step = get_or_none(key_metric_spec, "step")
+    metric_family = get_or_none(key_metric_spec, "metric-family")
+    metric_json_path = get_or_none(key_metric_spec, "metric-json-path")
+    metric_name = get_or_none(key_metric_spec, "metric-name")
+    metric_unit = get_or_none(key_metric_spec, "unit")
+    metric_type = get_or_none(key_metric_spec, "metric-type")
+    metric_comparison = get_or_none(key_metric_spec, "comparison")
+    metric_per_step_comparison_priority = get_or_none(
         key_metric_spec, "per-step-comparison-metric-priority"
     )
     return (
@@ -132,4 +132,4 @@ def get_metric_detail(key_metric_spec):
         metric_type,
         metric_comparison,
         metric_per_step_comparison_priority,
-    )
+    )

redisbench_admin/export/common/common.py

@@ -1,9 +1,10 @@
 from redisbench_admin.export.common.common import (
-    get_or_None,
+    get_or_none,
     get_kv_tags,
     prepare_tags,
     get_timeserie_name,
-    add_datapoint, get_metric_detail,
+    add_datapoint,
+    get_metric_detail,
 )
 from redisbench_admin.export.redis_benchmark.metrics_definition import (
     redis_benchmark_metrics_definition,
@@ -22,7 +23,7 @@ def warn_if_tag_none(tagName, tagValue, tool, level="Warning"):
 def get_tag_fromextra_tags_array(array, tagName):
     result = None
     for innerDict in array:
-        inneResult = get_or_None(innerDict, tagName)
+        inneResult = get_or_none(innerDict, tagName)
         if inneResult is not None:
             result = inneResult
     return result
@@ -49,7 +50,7 @@ def fill_tags_from_passed_array(extra_tags_array):
 
 
 def redis_benchmark_export_logic(
-        benchmark_result, extra_tags_array, results_type, time_series_dict, use_result
+    benchmark_result, extra_tags_array, results_type, time_series_dict, use_result
 ):
     ok = True
     start_time_ms = get_tag_fromextra_tags_array(extra_tags_array, "start_time_ms")