update_tests_for_opentsdb23

Author: Helene

tests/test_opentsdb.py

@@ -103,8 +103,9 @@ def query_arrays_setup():
                            }
             }
 
+
 def query_raw_data_setup():
-    global jreq, jreq1, jreq2, jreq3
+    global jreq, jreq1, jreq2, jreq3, jreq4
 
     jreq = {'start': 1739214930519, 'end': 1739215230519, 'arrays': True,
             'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
@@ -117,7 +118,7 @@ def query_raw_data_setup():
                            }
             }
     jreq1 = {'start': 1739214930519, 'end': 1739215230519, 'arrays': True,
-            'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
+             'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
                            'filters': [
                                {'filter': 'scale-11', 'groupBy': False,
                                 'tagk': 'node', 'type': 'pm_filter'
@@ -127,7 +128,7 @@ def query_raw_data_setup():
                            }
             }
     jreq2 = {'start': 1739214930519, 'end': 1739215230519, 'arrays': True,
-            'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
+             'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
                            'filters': [
                                {'filter': 'scale-11', 'groupBy': False,
                                 'tagk': 'node', 'type': 'pm_filter'
@@ -136,6 +137,23 @@ def query_raw_data_setup():
                            'shouldComputeRate': True, 'isCounter': True
                            }
             }
+    jreq3 = {'start':1746277483949, 'end': None,
+             'inputQuery': {'aggregator': 'noop', 'downsampleAggregator': 'avg', 
+                            'downsampleFillPolicy': 'none',
+                            'metric': 'cpu_contexts',
+                            'disableDownsampling': True, 
+                            'explicitTags': True, 'index': 0
+                            }
+             }
+    jreq4 = {'start':1746277483949, 'end': None,
+             'inputQuery': {'aggregator': 'noop', 'downsampleAggregator': 'avg', 
+                            'downsampleFillPolicy': 'none',
+                            'metric': 'cpu_contexts',
+                            'disableDownsampling': True, 
+                            'explicitTags': False, 'index': 0
+                            }
+             }
+
 
 
 @with_setup(my_setup)
@@ -245,3 +263,11 @@ def test_case08():
     args2 = {}
     args2['rawData'] = q2.get('explicitTags', False) or q2.get('isCounter', False)
     assert args2.get('rawData') == True
+    q3 = jreq3.get('inputQuery')
+    args3 = {}
+    args3['rawData'] = q3.get('explicitTags', False) or q3.get('isCounter', False)
+    assert args3.get('rawData') == True
+    q4 = jreq4.get('inputQuery')
+    args4 = {}
+    args4['rawData'] = q4.get('explicitTags', False) or q4.get('isCounter', False)
+    assert args4.get('rawData') == False