Merge pull request python-diamond#629 from williamjoy/patch-2

dict generator does not work for python 2.6
jhannus · Apr 5, 2017 · 50e7eb5 · 50e7eb5
2 parents ce5a2b8 + 40b9e2d
commit 50e7eb5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/collectors/mesos/mesos.py b/src/collectors/mesos/mesos.py
@@ -170,10 +170,8 @@ def _group_and_publish_tasks_statistics(self, result):
 
     def _sum_statistics(self, x, y):
         stats = set(x) | set(y)
-        summed_stats = {
-            key: x.get(key, 0) + y.get(key, 0)
-            for key in stats
-        }
+        summed_stats = dict([(key, x.get(key, 0) + y.get(key, 0))
+                             for key in stats])
         return summed_stats
 
     def _collect_slave_statistics(self):

diff --git a/src/collectors/mesos/test/testmesos.py b/src/collectors/mesos/test/testmesos.py
@@ -164,6 +164,13 @@ def test_https(self):
         self.assertEqual('https://localhost:5050/metrics/snapshot',
                          self.collector._get_url("metrics/snapshot"))
 
+    def test_sum_statistics(self):
+        metrics_1 = {'cpu': 50, 'mem': 30, 'loadavg': 1}
+        metrics_2 = {'cpu': 10, 'mem': 30, 'network': 10}
+        self.assertEqual(self.collector._sum_statistics(metrics_1, metrics_2),
+                         {'mem': 60, 'loadavg': 1, 'network': 10, 'cpu': 60})
+
+
 ##########################################################################
 if __name__ == "__main__":
     unittest.main()