From 245febdaf5c60f47232e9d4fc63c62ff0ff7f1a5 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 27 Jul 2017 14:10:04 +0200 Subject: [PATCH 1/2] tests: fix most flake8 issues --- tests/asyncio/test_asyncio_http.py | 3 +-- tests/client/client_tests.py | 5 ++--- tests/contrib/django/django_tests.py | 17 ++++++++--------- tests/contrib/django/testapp/__init__.py | 2 +- tests/contrib/django/testapp/urls.py | 2 +- tests/contrib/django/testapp/views.py | 4 ++-- tests/contrib/pylons/tests.py | 2 +- tests/contrib/zerorpc/zeropc_tests.py | 10 ++++------ .../django_tests/template_tests.py | 5 ++--- tests/instrumentation/psycopg2_tests.py | 1 + tests/instrumentation/pymongo_tests.py | 8 ++++---- tests/instrumentation/urllib3_tests.py | 4 +++- tests/transports/test_http.py | 4 +--- tests/transports/test_urllib3.py | 9 +++------ tests/utils/compat.py | 5 ++--- tests/utils/lru_tests.py | 4 ++-- 16 files changed, 38 insertions(+), 47 deletions(-) diff --git a/tests/asyncio/test_asyncio_http.py b/tests/asyncio/test_asyncio_http.py index b4268c91..9409a4bc 100644 --- a/tests/asyncio/test_asyncio_http.py +++ b/tests/asyncio/test_asyncio_http.py @@ -7,6 +7,7 @@ pytestmark = pytest.mark.skipif(sys.version_info < (3, 5), reason='python3.5+ requried for asyncio') + @pytest.fixture def mock_client(mocker): mock_client = mocker.MagicMock() @@ -18,7 +19,6 @@ async def read(): response.read = read - class fake_post: async def __aenter__(self, *args, **kwargs): response.status = mock_client.status @@ -34,7 +34,6 @@ def __init__(self, *args, **kwargs): mock_client.args = args mock_client.kwargs = kwargs - mock_client.post = mocker.Mock(side_effect=fake_post) return mock_client diff --git a/tests/client/client_tests.py b/tests/client/client_tests.py index 63b43fb1..7c70b8f0 100644 --- a/tests/client/client_tests.py +++ b/tests/client/client_tests.py @@ -232,7 +232,6 @@ def test_send_remote_failover_async(self, should_try, http_send): @mock.patch('opbeat.base.time.time') def test_send(self, time, send_remote): time.return_value = 1328055286.51 - public = "public" access_token = "secret" client = Client( servers=['http://example.com'], @@ -451,7 +450,7 @@ def test_long_message(self): def test_long_culprit(self): culprit = 'c' * 101 - self.client.capture('Message', message='test', data={'culprit':culprit}) + self.client.capture('Message', message='test', data={'culprit': culprit}) self.assertEquals(len(self.client.events), 1) event = self.client.events.pop(0) @@ -460,7 +459,7 @@ def test_long_culprit(self): def test_long_logger(self): logger = 'c' * 61 - self.client.capture('Message', message='test', data={'logger':logger}) + self.client.capture('Message', message='test', data={'logger': logger}) self.assertEquals(len(self.client.events), 1) event = self.client.events.pop(0) diff --git a/tests/contrib/django/django_tests.py b/tests/contrib/django/django_tests.py index b01e7bcb..324f1040 100644 --- a/tests/contrib/django/django_tests.py +++ b/tests/contrib/django/django_tests.py @@ -104,7 +104,7 @@ def test_basic(self): self.assertEquals(event['message'], 'foo') self.assertEquals(event['level'], 'error') - self.assertEquals(event['param_message'], {'message':'foo','params':()}) + self.assertEquals(event['param_message'], {'message': 'foo', 'params': ()}) self.assertEquals(type(event['timestamp']), datetime.datetime) def test_signal_integration(self): @@ -394,7 +394,7 @@ def test_record_none_exc_info(self): self.assertEquals(len(self.opbeat.events), 1) event = self.opbeat.events.pop(0) - self.assertEquals(event['param_message'], {'message': 'test','params':()}) + self.assertEquals(event['param_message'], {'message': 'test', 'params': ()}) def test_404_middleware(self): with self.settings(MIDDLEWARE_CLASSES=['opbeat.contrib.django.middleware.Opbeat404CatchMiddleware']): @@ -790,7 +790,7 @@ def test_request_metrics_contrib_redirect(self): 'django.contrib.redirects.middleware.RedirectFallbackMiddleware', ], ): - response = self.client.get('/redirect/me/') + self.client.get('/redirect/me/') timed_requests, _traces = self.opbeat.instrumentation_store.get_all() timing = timed_requests[0] @@ -821,7 +821,7 @@ def test_request_metrics_contrib_redirect_new_style_middleware(self): 'django.contrib.redirects.middleware.RedirectFallbackMiddleware', ], ): - response = self.client.get('/redirect/me/') + self.client.get('/redirect/me/') timed_requests, _traces = self.opbeat.instrumentation_store.get_all() timing = timed_requests[0] @@ -1095,7 +1095,7 @@ def test_stacktrace_filtered_for_opbeat(): "opbeat.traces.RequestsStore.should_collect") as should_collect: should_collect.return_value = False with override_settings(MIDDLEWARE_CLASSES=[ - 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): + 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): resp = client.get(reverse("render-heavy-template")) assert resp.status_code == 200 @@ -1122,7 +1122,7 @@ def test_perf_template_render(benchmark): with mock.patch("opbeat.traces.RequestsStore.should_collect") as should_collect: should_collect.return_value = False with override_settings(MIDDLEWARE_CLASSES=[ - 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): + 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): resp = benchmark(client_get, client, reverse("render-heavy-template")) assert resp.status_code == 200 @@ -1162,7 +1162,7 @@ def test_perf_database_render(benchmark): should_collect.return_value = False with override_settings(MIDDLEWARE_CLASSES=[ - 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): + 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): resp = benchmark(client_get, client, reverse("render-user-template")) assert resp.status_code == 200 @@ -1202,8 +1202,7 @@ def test_perf_transaction_with_collection(benchmark): client = _TestClient() with override_settings(MIDDLEWARE_CLASSES=[ - 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): - + 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): for i in range(10): resp = client_get(client, reverse("render-user-template")) assert resp.status_code == 200 diff --git a/tests/contrib/django/testapp/__init__.py b/tests/contrib/django/testapp/__init__.py index fa28f628..5f0fe907 100644 --- a/tests/contrib/django/testapp/__init__.py +++ b/tests/contrib/django/testapp/__init__.py @@ -2,4 +2,4 @@ from __future__ import absolute_import -from .celery import app as celery_app +from .celery import app as celery_app # noqa diff --git a/tests/contrib/django/testapp/urls.py b/tests/contrib/django/testapp/urls.py index 8762388f..39260aff 100644 --- a/tests/contrib/django/testapp/urls.py +++ b/tests/contrib/django/testapp/urls.py @@ -31,4 +31,4 @@ def handler500(request): if django.VERSION >= (1, 8): urlpatterns += url(r'^render-jinja2-template$', views.render_jinja2_template, - name='render-jinja2-template'), + name='render-jinja2-template'), diff --git a/tests/contrib/django/testapp/views.py b/tests/contrib/django/testapp/views.py index 303ea3f9..03806f4d 100644 --- a/tests/contrib/django/testapp/views.py +++ b/tests/contrib/django/testapp/views.py @@ -51,8 +51,8 @@ def something_expensive(): with trace("something_expensive", "code"): return [User(username='Ron'), User(username='Beni')] - return render(request, "list_users.html", - {'users': something_expensive}) + return render(request, "list_users.html", { + 'users': something_expensive}) def render_jinja2_template(request): diff --git a/tests/contrib/pylons/tests.py b/tests/contrib/pylons/tests.py index 1d432ad7..dfea2a73 100644 --- a/tests/contrib/pylons/tests.py +++ b/tests/contrib/pylons/tests.py @@ -19,4 +19,4 @@ def test_init(self): 'opbeat.app_id': 'p' * 32, 'opbeat.secret_token': 'a' * 32, } - middleware = Opbeat(self.app, config) + Opbeat(self.app, config) diff --git a/tests/contrib/zerorpc/zeropc_tests.py b/tests/contrib/zerorpc/zeropc_tests.py index 1aeb24cc..1fc46652 100644 --- a/tests/contrib/zerorpc/zeropc_tests.py +++ b/tests/contrib/zerorpc/zeropc_tests.py @@ -13,22 +13,20 @@ zerorpc = pytest.importorskip("zerorpc") gevent = pytest.importorskip("gevent") - - -has_unsupported_pypy = (hasattr(sys, 'pypy_version_info') - and sys.pypy_version_info < (2, 6)) +has_unsupported_pypy = (hasattr(sys, 'pypy_version_info') and + sys.pypy_version_info < (2, 6)) class ZeroRPCTest(TestCase): def setUp(self): self._socket_dir = tempfile.mkdtemp(prefix='opbeatzerorpcunittest') self._server_endpoint = 'ipc://{0}'.format(os.path.join( - self._socket_dir, 'random_zeroserver' + self._socket_dir, 'random_zeroserver' )) self._opbeat = get_tempstoreclient() zerorpc.Context.get_instance().register_middleware(OpbeatMiddleware( - client=self._opbeat + client=self._opbeat )) @pytest.mark.skipif(has_unsupported_pypy, reason='Failure with pypy < 2.6') diff --git a/tests/instrumentation/django_tests/template_tests.py b/tests/instrumentation/django_tests/template_tests.py index 01bc1d4d..d862e516 100644 --- a/tests/instrumentation/django_tests/template_tests.py +++ b/tests/instrumentation/django_tests/template_tests.py @@ -39,7 +39,7 @@ def setUp(self): def test_template_rendering(self, should_collect): should_collect.return_value = False with self.settings(MIDDLEWARE_CLASSES=[ - 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): + 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware']): self.client.get(reverse('render-heavy-template')) self.client.get(reverse('render-heavy-template')) self.client.get(reverse('render-heavy-template')) @@ -84,8 +84,7 @@ def test_template_rendering_django18_jinja2(self, should_collect): should_collect.return_value = False with self.settings(MIDDLEWARE_CLASSES=[ 'opbeat.contrib.django.middleware.OpbeatAPMMiddleware'], - TEMPLATES=TEMPLATES - ): + TEMPLATES=TEMPLATES): self.client.get(reverse('render-jinja2-template')) self.client.get(reverse('render-jinja2-template')) self.client.get(reverse('render-jinja2-template')) diff --git a/tests/instrumentation/psycopg2_tests.py b/tests/instrumentation/psycopg2_tests.py index 3653107d..173e544b 100644 --- a/tests/instrumentation/psycopg2_tests.py +++ b/tests/instrumentation/psycopg2_tests.py @@ -209,6 +209,7 @@ def test_multi_statement_sql(): assert "CREATE TABLE" == actual + @pytest.mark.skipif(travis_and_psycopg2, reason="Requires postgres server. Only runs on travisci.") def test_psycopg2_register_type(postgres_connection): diff --git a/tests/instrumentation/pymongo_tests.py b/tests/instrumentation/pymongo_tests.py index 20b66703..54514e29 100644 --- a/tests/instrumentation/pymongo_tests.py +++ b/tests/instrumentation/pymongo_tests.py @@ -135,10 +135,10 @@ def test_collection_find(self): for i in range(1000): blogposts.append({'author': 'Tom', 'comments': i}) self.db.blogposts.insert(blogposts) - r = self.db.blogposts.insert(blogpost) + self.db.blogposts.insert(blogpost) self.client.instrumentation_store.get_all() self.client.begin_transaction('transaction.test') - r = list(self.db.blogposts.find({'comments': {'$gt': 995}})) + self.db.blogposts.find({'comments': {'$gt': 995}}) self.client.end_transaction('transaction.test') transactions, traces = self.client.instrumentation_store.get_all() @@ -198,7 +198,7 @@ def test_collection_update_one(self): r = self.db.blogposts.insert(blogpost) self.client.begin_transaction('transaction.test') r = self.db.blogposts.update_one({'author': 'Tom'}, - {'$set': {'author': 'Jerry'}}) + {'$set': {'author': 'Jerry'}}) self.assertEqual(r.modified_count, 1) self.client.end_transaction('transaction.test') transactions, traces = self.client.instrumentation_store.get_all() @@ -214,7 +214,7 @@ def test_collection_update_many(self): r = self.db.blogposts.insert(blogpost) self.client.begin_transaction('transaction.test') r = self.db.blogposts.update_many({'author': 'Tom'}, - {'$set': {'author': 'Jerry'}}) + {'$set': {'author': 'Jerry'}}) self.assertEqual(r.modified_count, 1) self.client.end_transaction('transaction.test') transactions, traces = self.client.instrumentation_store.get_all() diff --git a/tests/instrumentation/urllib3_tests.py b/tests/instrumentation/urllib3_tests.py index 209a1d9a..71c4c9d5 100644 --- a/tests/instrumentation/urllib3_tests.py +++ b/tests/instrumentation/urllib3_tests.py @@ -17,9 +17,11 @@ import SimpleHTTPServer from SocketServer import TCPServer + class MyTCPServer(TCPServer): allow_reuse_address = True + class InstrumentUrllib3Test(TestCase): def setUp(self): self.client = get_tempstoreclient() @@ -49,7 +51,7 @@ def test_urllib3(self, should_collect): pool = urllib3.PoolManager(timeout=0.1) url = 'http://localhost:{0}/hello_world'.format(self.port) - r = pool.request('GET', url) + pool.request('GET', url) self.client.end_transaction("MyView") diff --git a/tests/transports/test_http.py b/tests/transports/test_http.py index 8550b6d7..dd093b50 100644 --- a/tests/transports/test_http.py +++ b/tests/transports/test_http.py @@ -46,9 +46,7 @@ def test_http_error(self, mock_urlopen): @mock.patch('opbeat.transport.http.urlopen') def test_generic_error(self, mock_urlopen): - url, status, message, body = ( - 'http://localhost:9999', 418, "I'm a teapot", 'Nothing' - ) + url = 'http://localhost:9999' transport = HTTPTransport(urlparse.urlparse(url)) mock_urlopen.side_effect = Exception('Oopsie') with pytest.raises(TransportException) as exc_info: diff --git a/tests/transports/test_urllib3.py b/tests/transports/test_urllib3.py index 83941904..30f55ef1 100644 --- a/tests/transports/test_urllib3.py +++ b/tests/transports/test_urllib3.py @@ -5,8 +5,7 @@ from urllib3_mock import Responses from opbeat.transport.base import TransportException -from opbeat.transport.http_urllib3 import (AsyncUrllib3Transport, - Urllib3Transport) +from opbeat.transport.http_urllib3 import Urllib3Transport try: import urlparse @@ -14,9 +13,9 @@ from urllib import parse as urlparse - responses = Responses('urllib3') + @responses.activate def test_send(): transport = Urllib3Transport(urlparse.urlparse('http://localhost')) @@ -52,9 +51,7 @@ def test_http_error(): @responses.activate def test_generic_error(): - url, status, message, body = ( - 'http://localhost:9999', 418, "I'm a teapot", 'Nothing' - ) + url, status = 'http://localhost:9999', 418 transport = Urllib3Transport(urlparse.urlparse(url)) responses.add('POST', '/', status=status, body=Exception('Oopsie')) with pytest.raises(TransportException) as exc_info: diff --git a/tests/utils/compat.py b/tests/utils/compat.py index b2b06fe4..82594f4a 100644 --- a/tests/utils/compat.py +++ b/tests/utils/compat.py @@ -1,7 +1,6 @@ - try: from unittest2 import TestCase from unittest2 import skipIf except ImportError: - from unittest import TestCase - from unittest import skipIf + from unittest import TestCase # noqa + from unittest import skipIf # noqa diff --git a/tests/utils/lru_tests.py b/tests/utils/lru_tests.py index 9924d4e0..40e5ada5 100644 --- a/tests/utils/lru_tests.py +++ b/tests/utils/lru_tests.py @@ -12,6 +12,6 @@ def test_insert_overflow(self): for x in range(6): lru.set(x) - self.assertFalse(lru.has_key(1)) + self.assertFalse(1 in lru) for x in range(2, 6): - self.assertTrue(lru.has_key(x)) + self.assertTrue(x in lru) From 9b915f961b574b0bcffbf0230698d8977691ce7e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 27 Jul 2017 14:11:43 +0200 Subject: [PATCH 2/2] setup.cfg: pytest: specify testpaths, use tool:pytest [ci skip] --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f5819252..1e3e6c48 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,8 +5,9 @@ verbose=2 [bdist_wheel] universal=0 -[pytest] +[tool:pytest] python_files=tests.py test_*.py *_tests.py +testpaths = tests isort_ignore= opbeat/transport/asyncio.py opbeat/contrib/asyncio/client.py