Handle multiple modifications to distribution metrics correctly.

appengine_module/gae_ts_mon/test/deferred_metric_store_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import operator
 import unittest
 
 import gae_ts_mon
 import mock
 
@@ skipping 98 matching lines @@
   def test_deferred_incr_then_set(self):
     self.store.initialize_context()
     self.counter_metric.increment()
     self.counter_metric.set(42)
     self.store.finalize_context()
 
     self.assertEquals(42, self.counter_metric.get())
 
   def test_deferred_set_then_set(self):
     self.store.initialize_context()
+    self.counter_metric.set(12)
     self.counter_metric.set(42)
-    self.counter_metric.set(12)
     self.store.finalize_context()
 
-    self.assertEquals(12, self.counter_metric.get())
+    self.assertEquals(42, self.counter_metric.get())
 
   def test_deferred_set_with_fields(self):
     self.store.initialize_context()
     self.gauge_metric.set(41, {'f': 1})
     self.gauge_metric.set(42, {'f': 2})
     self.store.finalize_context()
 
     self.assertEqual(41, self.gauge_metric.get({'f': 1}))
     self.assertEqual(42, self.gauge_metric.get({'f': 2}))
 
   def test_deferred_distribution_incr(self):
     self.store.initialize_context()
     self.cumulative_dist_metric.add(6)
     self.store.finalize_context()
 
     self.assertEquals(6, self.cumulative_dist_metric.get().sum)
 
   def test_deferred_distribution_incr_then_incr(self):
     self.store.initialize_context()
     self.cumulative_dist_metric.add(4)
     self.cumulative_dist_metric.add(1)
     self.store.finalize_context()
 
-    self.assertEquals(5, self.cumulative_dist_metric.get().sum)
+    dist = self.cumulative_dist_metric.get()
+    self.assertEquals(5, dist.sum)
+    self.assertEquals(2, dist.count)
+    self.assertEquals([2, 5], sorted(dist.buckets.keys()))