Merge pull request #2223 from DanCech/handle-none

handle case when node.fetch returns None

webapp/graphite/finders/utils.py

@@ -129,26 +129,31 @@ def fetch(self, patterns, start_time, end_time, now=None, requestContext=None):
             for pattern in patterns
         ]
 
-        result = []
+        results = []
 
         for node, query in self.find_multi(queries):
             if not isinstance(node, LeafNode):
                 continue
 
-            time_info, values = node.fetch(
+            result = node.fetch(
                 start_time, end_time,
                 now=now, requestContext=requestContext
             )
 
-            result.append({
+            if result is None:
+                continue
+
+            time_info, values = result
+
+            results.append({
                 'pathExpression': query.pattern,
                 'path': node.path,
                 'name': node.path,
                 'time_info': time_info,
                 'values': values,
             })
 
-        return result
+        return results
 
     def auto_complete_tags(self, exprs, tagPrefix=None, limit=None, requestContext=None):
         return []

webapp/tests/test_finders.py

@@ -199,6 +199,9 @@ def test_standard_finder(self,scandir_mock):
             self.assertEqual(len(list(nodes)), 1)
             self.assertEqual(scandir_mock.call_count, 1)
 
+            results = finder.fetch(['foo'], 0, 1)
+            self.assertEqual(results, [])
+
         finally:
             scandir_mock.call_count = 0
             self.wipe_whisper()