diff options
| author | James Socol <james@thegroundwork.com> | 2015-03-26 14:33:18 -0400 |
|---|---|---|
| committer | James Socol <james@thegroundwork.com> | 2015-03-26 14:33:18 -0400 |
| commit | 852c849b74cae87c80df89aafe0a9fb11bcccae5 (patch) | |
| tree | 5966699855f89705b7f97086208e7f4878e9a7ac | |
| parent | e78b04626aade2d912da6e54fb149856082e8ee8 (diff) | |
| parent | 203f3a68ab9758b9f48c67233b24d9456d8423dc (diff) | |
| download | pystatsd-852c849b74cae87c80df89aafe0a9fb11bcccae5.tar.gz | |
Merge branch 'travis-flake8'
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | statsd/tests.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 9208899..6e420d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +sudo: false python: - "2.6" - "2.7" @@ -6,4 +7,8 @@ python: - "3.3" - "3.4" - "pypy" -script: nosetests +install: + - pip install -q flake8 +script: + - nosetests + - flake8 statsd/ diff --git a/statsd/tests.py b/statsd/tests.py index 16cf7ac..81a73c8 100644 --- a/statsd/tests.py +++ b/statsd/tests.py @@ -556,13 +556,11 @@ def _test_timer_context_exceptions(cl, proto): def test_timer_context_exceptions_udp(): - """Exceptions within a managed block should get logged and propagate (UDP).""" cl = _udp_client() _test_timer_context_exceptions(cl, 'udp') def test_timer_context_exceptions_tcp(): - """Exceptions within a managed block should get logged and propagate (TCP).""" cl = _tcp_client() _test_timer_context_exceptions(cl, 'tcp') @@ -579,13 +577,11 @@ def _test_timer_decorator_exceptions(cl, proto): def test_timer_decorator_exceptions_udp(): - """Exceptions from wrapped methods should get logged and propagate (UDP).""" cl = _udp_client() _test_timer_decorator_exceptions(cl, 'udp') def test_timer_decorator_exceptions_tcp(): - """Exceptions from wrapped methods should get logged and propagate (TCP).""" cl = _tcp_client() _test_timer_decorator_exceptions(cl, 'tcp') |