Remove testing for aiohttp versions outside 3 year support window. (#424)

* Remove testing for aiohttp versions outside 3 year support window.

* Fix starlette testing

Co-authored-by: Uma Annamalai <[email protected]>
Co-authored-by: Lalleh Rafeei <[email protected]>

* [Mega-Linter] Apply linters fixes

* Bump Tests

Co-authored-by: Tim Pansino <[email protected]>
Co-authored-by: Uma Annamalai <[email protected]>
Co-authored-by: Lalleh Rafeei <[email protected]>
Co-authored-by: TimPansino <[email protected]>

Author: 3 people

tests/framework_starlette/test_application.py

@@ -16,14 +16,14 @@
 
 import pytest
 import starlette
-
-from newrelic.common.object_names import callable_name
 from testing_support.fixtures import (
     override_ignore_status_codes,
     validate_transaction_errors,
     validate_transaction_metrics,
 )
 
+from newrelic.common.object_names import callable_name
+
 
 @pytest.fixture(scope="session")
 def target_application():
@@ -96,27 +96,28 @@ def test_exception_in_middleware(target_application, app_name):
     app = target_application[app_name]
 
     from starlette import __version__ as version
+
     starlette_version = tuple(int(v) for v in version.split("."))
 
-    # Starlette >=0.15 raises an exception group instead of reraising the ValueError
+    # Starlette >=0.15 and <0.17 raises an exception group instead of reraising the ValueError
     # This only occurs on Python versions >=3.8
-    if sys.version_info[0:2] > (3, 7) and starlette_version >= (0, 15, 0):
+    if sys.version_info[0:2] > (3, 7) and starlette_version >= (0, 15, 0) and starlette_version < (0, 17, 0):
         from anyio._backends._asyncio import ExceptionGroup
+
         exc_type = ExceptionGroup
     else:
         exc_type = ValueError
 
     @validate_transaction_metrics(
         "_test_application:middleware_factory.<locals>.middleware",
-        scoped_metrics=[
-            ("Function/_test_application:middleware_factory.<locals>.middleware", 1)
-        ],
+        scoped_metrics=[("Function/_test_application:middleware_factory.<locals>.middleware", 1)],
         rollup_metrics=[FRAMEWORK_METRIC],
     )
     @validate_transaction_errors(errors=[callable_name(exc_type)])
     def _test():
         with pytest.raises(exc_type):  # Later versions of starlette
             app.get("/crash_me_now")
+
     _test()
 
 
@@ -161,14 +162,10 @@ def _test():
     ),
 )
 @validate_transaction_errors(errors=["builtins:RuntimeError"])
-def test_server_error_middleware(
-    target_application, app_name, transaction_name, path, scoped_metrics
-):
+def test_server_error_middleware(target_application, app_name, transaction_name, path, scoped_metrics):
     @validate_transaction_metrics(
         transaction_name,
-        scoped_metrics=scoped_metrics
-        + [("Function/_test_application:runtime_error", 1)]
-        + DEFAULT_MIDDLEWARE_METRICS,
+        scoped_metrics=scoped_metrics + [("Function/_test_application:runtime_error", 1)] + DEFAULT_MIDDLEWARE_METRICS,
         rollup_metrics=[FRAMEWORK_METRIC],
     )
     def _test():
@@ -196,9 +193,7 @@ def _test():
         ),
     ),
 )
-def test_application_handled_error(
-    target_application, app_name, transaction_name, path, error
-):
+def test_application_handled_error(target_application, app_name, transaction_name, path, error):
     @validate_transaction_errors(errors=[error])
     @validate_transaction_metrics(
         transaction_name,
@@ -229,9 +224,7 @@ def _test():
     ),
 )
 @override_ignore_status_codes(set((500,)))
-def test_application_ignored_error(
-    target_application, app_name, transaction_name, path
-):
+def test_application_ignored_error(target_application, app_name, transaction_name, path):
     @validate_transaction_errors(errors=[])
     @validate_transaction_metrics(
         transaction_name,
@@ -276,9 +269,7 @@ def _test():
 
 @pytest.mark.parametrize("app_name", ("no_middleware",))
 @validate_transaction_errors(errors=["builtins:RuntimeError"])
-@validate_transaction_metrics(
-    "_test_application:CustomRoute", rollup_metrics=[FRAMEWORK_METRIC]
-)
+@validate_transaction_metrics("_test_application:CustomRoute", rollup_metrics=[FRAMEWORK_METRIC])
 def test_starlette_http_exception_after_response_start(target_application, app_name):
     app = target_application[app_name]
     with pytest.raises(RuntimeError):

tests/framework_starlette/test_graphql.py

@@ -13,20 +13,32 @@
 # limitations under the License.
 
 import json
+
 import pytest
 from testing_support.fixtures import dt_enabled, validate_transaction_metrics
 from testing_support.validators.validate_span_events import validate_span_events
 
+
+def get_starlette_version():
+    import starlette
+
+    version = getattr(starlette, "__version__", "0.0.0").split(".")
+    return tuple(int(x) for x in version)
+
+
 @pytest.fixture(scope="session")
 def target_application():
     import _test_graphql
 
     return _test_graphql.target_application
 
+
 @dt_enabled
 @pytest.mark.parametrize("endpoint", ("/async", "/sync"))
+@pytest.mark.skipif(get_starlette_version() >= (0, 17), reason="Starlette GraphQL support dropped in v0.17.0")
 def test_graphql_metrics_and_attrs(target_application, endpoint):
     from graphql import __version__ as version
+
     from newrelic.hooks.framework_graphql import graphene_framework_details
 
     FRAMEWORK_METRICS = [
@@ -65,7 +77,9 @@ def test_graphql_metrics_and_attrs(target_application, endpoint):
         rollup_metrics=_test_unscoped_metrics + FRAMEWORK_METRICS,
     )
     def _test():
-        response = target_application.make_request("POST", endpoint, body=json.dumps({"query": "{ hello }"}), headers={"Content-Type": "application/json"})
+        response = target_application.make_request(
+            "POST", endpoint, body=json.dumps({"query": "{ hello }"}), headers={"Content-Type": "application/json"}
+        )
         assert response.status == 200
         assert "Hello!" in response.body.decode("utf-8")
 

tox.ini

@@ -95,8 +95,6 @@ envlist =
     python-external_requests-{py27,py36,py37,py38,py39,py310,pypy,pypy3},
     python-external_urllib3-{py27,py37,pypy}-urllib3{0109},
     python-external_urllib3-{py27,py36,py37,py38,py39,py310,pypy,pypy3}-urllib3latest,
-    python-framework_aiohttp-{py36}-aiohttp{01,0202,02},
-    python-framework_aiohttp-{py36,py37}-aiohttp0304,
     python-framework_aiohttp-{py36,py37,py38,py39,py310,pypy3}-aiohttp03,
     python-framework_ariadne-{py36,py37,py38,py39,py310}-ariadnelatest,
     python-framework_ariadne-py37-ariadne{0011,0012,0013},
@@ -130,7 +128,8 @@ envlist =
     python-framework_pyramid-{pypy3,py36,py37,py38,py39,py310}-Pyramidmaster,
     python-framework_sanic-{py38,pypy3}-sanic{190301,1906,1812,1912,200904,210300},
     python-framework_sanic-{py36,py37,py38,py310,pypy3}-saniclatest,
-    python-framework_starlette-{py36,py37,py38,py39,py310, pypy3}-starlette{0014,latest},
+    python-framework_starlette-{py36,py310,pypy3}-starlette{0014,0015},
+    python-framework_starlette-{py36,py37,py38,py39,py310, pypy3}-starlette{latest},
     python-framework_strawberry-{py37,py38,py39,py310}-strawberrylatest,
     libcurl-framework_tornado-{py36,py37,py38,py39,py310,pypy3}-tornado0600,
     libcurl-framework_tornado-{py36,py37,py38,py39,py310,pypy3}-tornadomaster,
@@ -223,13 +222,6 @@ deps =
     external_requests: requests
     external_urllib3-urllib30109: urllib3<1.10
     external_urllib3-urllib3latest: urllib3
-    framework_aiohttp-aiohttp01: multidict<3
-    framework_aiohttp-aiohttp0202: multidict<3
-    framework_aiohttp-aiohttp0202: yarl<0.13
-    framework_aiohttp-aiohttp01: aiohttp<2
-    framework_aiohttp-aiohttp0202: aiohttp<2.3
-    framework_aiohttp-aiohttp02: aiohttp<3
-    framework_aiohttp-aiohttp0304: aiohttp<3.5
     framework_aiohttp-aiohttp03: aiohttp<4
     framework_ariadne-ariadnelatest: ariadne
     framework_ariadne-ariadne0011: ariadne<0.12
@@ -296,6 +288,7 @@ deps =
     framework_sanic-sanic{1812,190301,1906}: aiohttp
     framework_starlette: graphene
     framework_starlette-starlette0014: starlette<0.15
+    framework_starlette-starlette0015: starlette<0.16
     framework_starlette-starlettelatest: starlette
     framework_strawberry: starlette
     framework_strawberry-strawberrylatest: strawberry-graphql