Extended tests on exporter_create_ts() (#279)

Author: filipecosta90

redisbench_admin/utils/remote.py

@@ -549,19 +549,22 @@ def push_data_to_redistimeseries(rts, time_series_dict: dict, expire_msecs=0):
 
 
 def exporter_create_ts(rts, time_series, timeseries_name):
+    updated_create = False
     try:
-        if rts.redis.exists(timeseries_name) is False:
+        if rts.redis.exists(timeseries_name):
+            updated_create = check_rts_labels(rts, time_series, timeseries_name)
+        else:
             logging.debug(
                 "Creating timeseries named {} with labels {}".format(
                     timeseries_name, time_series["labels"]
                 )
             )
             rts.create(timeseries_name, labels=time_series["labels"], chunk_size=128)
-        else:
-            check_rts_labels(rts, time_series, timeseries_name)
+            updated_create = True
+
     except redis.exceptions.ResponseError as e:
         if "already exists" in e.__str__():
-            check_rts_labels(rts, time_series, timeseries_name)
+            updated_create = check_rts_labels(rts, time_series, timeseries_name)
             pass
         else:
             logging.error(
@@ -570,9 +573,11 @@ def exporter_create_ts(rts, time_series, timeseries_name):
                 )
             )
             raise
+    return updated_create
 
 
 def check_rts_labels(rts, time_series, timeseries_name):
+    updated_create = False
     logging.debug(
         "Timeseries named {} already exists. Checking that the labels match.".format(
             timeseries_name
@@ -586,7 +591,9 @@ def check_rts_labels(rts, time_series, timeseries_name):
                 timeseries_name, time_series["labels"]
             )
         )
+        updated_create = True
         rts.alter(timeseries_name, labels=time_series["labels"])
+    return updated_create
 
 
 def extract_redisgraph_version_from_resultdict(results_dict: dict):

tests/test_remote.py

@@ -449,3 +449,27 @@ def test_common_timeseries_extraction():
     assert timeseries_dict[key_self_t2]["labels"]["target+branch"] == "{} {}".format(
         break_by_value, "target-2"
     )
+
+
+def test_exporter_create_ts():
+    timeseries_name = "ts1"
+    time_series = {"labels": {"metric-type": "commandstats"}}
+    try:
+        rts = Client(port=16379)
+        rts.redis.ping()
+        rts.redis.flushall()
+        assert True == exporter_create_ts(rts, time_series, timeseries_name)
+        assert rts.redis.exists(timeseries_name)
+        # no update
+        assert False == exporter_create_ts(rts, time_series, timeseries_name)
+        # change existing label
+        time_series["labels"]["metric-type"] = "latencystats"
+        assert True == exporter_create_ts(rts, time_series, timeseries_name)
+        # add new label
+        time_series["labels"]["metric-name"] = "latency_usecs"
+        assert True == exporter_create_ts(rts, time_series, timeseries_name)
+        # no update
+        assert False == exporter_create_ts(rts, time_series, timeseries_name)
+
+    except redis.exceptions.ConnectionError:
+        pass