Handle multiple modifications to distribution metrics correctly.

infra_libs/ts_mon/common/test/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 functools
 import operator
 import time
 import unittest
 
 import mock
 
 from infra_libs.ts_mon.common import errors
 from infra_libs.ts_mon.common import metric_store
 from infra_libs.ts_mon.common import metrics
 from infra_libs.ts_mon.common.test import stubs
 
 
+class DefaultModifyFnTest(unittest.TestCase):
+  def test_adds(self):
+    fn = metric_store.default_modify_fn('foo')
+    self.assertEquals(5, fn(2, 3))
+    self.assertEquals(5, fn(3, 2))
+
+  def test_negative(self):
+    fn = metric_store.default_modify_fn('foo')
+    with self.assertRaises(errors.MonitoringDecreasingValueError) as cm:
+      fn(2, -1)
+    self.assertIn('"foo"', str(cm.exception))
+
+
 class MetricStoreTestBase(object):
   """Abstract base class for testing MetricStore implementations.
 
   This class doesn't inherit from unittest.TestCase to prevent it from being
   run automatically by expect_tests.
 
   Your subclass should inherit from this and unittest.TestCase, and set
   METRIC_STORE_CLASS to the implementation you want to test.  See
   InProcessMetricStoreTest in this file for an example.
   """
@@ skipping 98 matching lines @@
     self.store.set('foo', (('field', 'value'),), 42)
     self.store.reset_for_unittest(name='bar')
     self.assertEquals(42, self.store.get('foo', (('field', 'value'),)))
 
     self.store.reset_for_unittest(name='foo')
     self.assertIsNone(self.store.get('foo', (('field', 'value'),)))
 
 
 class InProcessMetricStoreTest(MetricStoreTestBase, unittest.TestCase):
   METRIC_STORE_CLASS = metric_store.InProcessMetricStore
-
-
-class CombineModificationsTest(unittest.TestCase):
-  def test_set_set(self):
-    self.assertEqual(
-        metric_store.Modification('two', (), 'set', (2, False)),
-        metric_store.combine_modifications(
-            metric_store.Modification('one', (), 'set', (1, False)),
-            metric_store.Modification('two', (), 'set', (2, False))))
-
-  def test_set_incr(self):
-    self.assertEqual(
-        metric_store.Modification('one', (), 'set', (3, False)),
-        metric_store.combine_modifications(
-            metric_store.Modification('one', (), 'set', (1, False)),
-            metric_store.Modification('two', (), 'incr', (2, operator.add))))
-
-  def test_incr_set(self):
-    self.assertEqual(
-        metric_store.Modification('two', (), 'set', (2, False)),
-        metric_store.combine_modifications(
-            metric_store.Modification('one', (), 'incr', (1, operator.add)),
-            metric_store.Modification('two', (), 'set', (2, False))))
-
-  def test_incr_incr(self):
-    self.assertEqual(
-        metric_store.Modification('one', (), 'incr', (3, operator.add)),
-        metric_store.combine_modifications(
-            metric_store.Modification('one', (), 'incr', (1, operator.add)),
-            metric_store.Modification('two', (), 'incr', (2, operator.add))))
-
-  def test_none_set(self):
-    self.assertEqual(
-        metric_store.Modification('two', (), 'set', (2, False)),
-        metric_store.combine_modifications(
-            None,
-            metric_store.Modification('two', (), 'set', (2, False))))
-
-  def test_none_incr(self):
-    self.assertEqual(
-        metric_store.Modification('two', (), 'incr', (2, operator.add)),
-        metric_store.combine_modifications(
-            None,
-            metric_store.Modification('two', (), 'incr', (2, operator.add))))
-
-  def test_bad_type(self):
-    with self.assertRaises(errors.UnknownModificationTypeError):
-      metric_store.combine_modifications(
-          metric_store.Modification('one', (), 'set', (1, False)),
-          metric_store.Modification('two', (), 'bad', (2, False)))