Merge pull request #2912 from npazosmendez/njpm/fix-non-negative-delta-none-val

Fix TypeError in _nonNegativeDelta when val is None and maxValue is set

Author: deniszh

webapp/graphite/render/functions.py

@@ -2427,14 +2427,17 @@ def nonNegativeDerivative(requestContext, seriesList, maxValue=None, minValue=No
 
 
 def _nonNegativeDelta(val, prev, maxValue, minValue):
+  if val is None:
+    return None, None
+
   # ignore values larger than maxValue
   if maxValue is not None and val > maxValue:
     return None, None
   if minValue is not None and val < minValue:
     return None, None
 
   # first reading
-  if None in (prev, val):
+  if prev is None:
     return None, val
 
   # counter increased, use the difference

webapp/tests/test_functions.py

@@ -1798,6 +1798,10 @@ def test_perSecond_nones(self):
         result = functions.scaleToSeconds({}, functions.nonNegativeDerivative({}, seriesList), 1)
         self.assertEqual(list(expected[0]), list(result[0]))
 
+        # None values should not raise TypeError when maxValue is set
+        result = functions.perSecond({}, seriesList, maxValue=1000)
+        self.assertEqual(list(expected[0]), list(result[0]))
+
     def test_perSecond_max(self):
         seriesList = self._gen_series_list_with_data(key='test',start=0,end=600,step=60,data=[0, 120, 240, 480, 960, 900, 120, 240, 119, 479])
         expected = [TimeSeries('perSecond(test)', 0, 600, 60, [None, 2, 2, 4, None, None, None, 2, 6, 6])]