added tests for timer and fixed issue where it was required to use "total" as a name for functions aswell

wolph · wolph · commit af2253d123c0 · 2012-07-06T10:33:54.000+02:00
diff --git a/statsd/__init__.py b/statsd/__init__.py
@@ -19,7 +19,7 @@
 ]
 
 __name__ = 'python-statsd'
-__version__ = '1.5.2'
+__version__ = '1.5.4'
 __author__ = 'Rick van Hattem'
 __author_email__ = 'Rick.van.Hattem@Fawo.nl'
 __description__ = ('''statsd is a client for Etsy's node-js statsd server. '''
diff --git a/statsd/timer.py b/statsd/timer.py
@@ -71,7 +71,7 @@ def _decorator(*args, **kwargs):
                 return function(*args, **kwargs)
             finally:
                 # Stop the timer, send the message and cleanup
-                timer.stop(name)
+                timer.stop('')
                 del timer
 
         return _decorator
diff --git a/tests/timer.py b/tests/timer.py
@@ -0,0 +1,70 @@
+from __future__ import with_statement
+import mock
+import statsd
+
+with mock.patch('statsd.Client') as mock_client:
+    instance = mock_client.return_value
+    instance._send.return_value = 1
+
+    # Some simple decorator tests
+    timer0 = statsd.Timer('timer0')
+    @timer0.decorate
+    def a():
+        pass
+    a()
+    mock_client._send.assert_called_with(mock.ANY, {'timer0.a': '0|ms'})
+
+
+    timer1 = statsd.Timer('timer1')
+    @timer1.decorate('spam')
+    def b():
+        pass
+    b()
+    mock_client._send.assert_called_with(mock.ANY, {'timer1.spam': '0|ms'})
+
+
+    timer2 = timer1.get_client('eggs')
+    @timer2.decorate
+    def c():
+        pass
+    c()
+    mock_client._send.assert_called_with(mock.ANY, {'timer1.eggs.c': '0|ms'})
+
+
+    timer3 = timer1.get_client('eggs0')
+    @timer3.decorate('d0')
+    def d():
+        pass
+    d()
+    mock_client._send.assert_called_with(mock.ANY, {'timer1.eggs0.d0': '0|ms'})
+
+
+
+    # More advanced usage with intermediate timers
+    timer4 = statsd.Timer('timer4')
+    timer4.start()
+    timer4.stop()
+    mock_client._send.assert_called_with(mock.ANY, {'timer4.total': '0|ms'})
+
+
+    timer5 = statsd.Timer('timer5')
+    timer5.start()
+    timer5.stop('test')
+    mock_client._send.assert_called_with(mock.ANY, {'timer5.test': '0|ms'})
+
+
+    timer6 = statsd.Timer('timer6')
+    timer6.start()
+    timer6.intermediate('extras')
+    mock_client._send.assert_called_with(mock.ANY, {'timer6.extras': '0|ms'})
+    timer6.stop()
+    mock_client._send.assert_called_with(mock.ANY, {'timer6.total': '0|ms'})
+
+
+    timer7 = statsd.Timer('timer7')
+    timer7.start()
+    timer7.intermediate('extras')
+    mock_client._send.assert_called_with(mock.ANY, {'timer7.extras': '0|ms'})
+    timer7.stop('test')
+    mock_client._send.assert_called_with(mock.ANY, {'timer7.test': '0|ms'})
+

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`]`
`20`	`20`
`21`	`21`	`__name__ = 'python-statsd'`
`22`		`-__version__ = '1.5.2'`
	`22`	`+__version__ = '1.5.4'`
`23`	`23`	`__author__ = 'Rick van Hattem'`
`24`	`24`	`__author_email__ = 'Rick.van.Hattem@Fawo.nl'`
`25`	`25`	`__description__ = ('''statsd is a client for Etsy's node-js statsd server. '''`