Always run the asgi tests

Since the client requires a minimum of Python 3.9, we don't need to have
this feature gate in place any more

Signed-off-by: Lexi Robinson <lexi@lexi.org.uk>

Author: Lexicality

tests/test_asgi.py

@@ -1,19 +1,11 @@
+import asyncio
 import gzip
-from unittest import skipUnless, TestCase
+from unittest import TestCase
 
-from prometheus_client import CollectorRegistry, Counter
-from prometheus_client.exposition import CONTENT_TYPE_PLAIN_0_0_4
-
-try:
-    # Python >3.5 only
-    import asyncio
+from asgiref.testing import ApplicationCommunicator
 
-    from asgiref.testing import ApplicationCommunicator
-
-    from prometheus_client import make_asgi_app
-    HAVE_ASYNCIO_AND_ASGI = True
-except ImportError:
-    HAVE_ASYNCIO_AND_ASGI = False
+from prometheus_client import CollectorRegistry, Counter, make_asgi_app
+from prometheus_client.exposition import CONTENT_TYPE_PLAIN_0_0_4
 
 
 def setup_testing_defaults(scope):
@@ -33,7 +25,6 @@ def setup_testing_defaults(scope):
 
 
 class ASGITest(TestCase):
-    @skipUnless(HAVE_ASYNCIO_AND_ASGI, "Don't have asyncio/asgi installed.")
     def setUp(self):
         self.registry = CollectorRegistry()
         self.captured_status = None
@@ -45,10 +36,8 @@ def setUp(self):
 
     def tearDown(self):
         if self.communicator:
-            asyncio.new_event_loop().run_until_complete(
-                self.communicator.wait()
-            )
-            
+            asyncio.new_event_loop().run_until_complete(self.communicator.wait())
+
     def seed_app(self, app):
         self.communicator = ApplicationCommunicator(app, self.scope)
 
@@ -106,22 +95,25 @@ def assert_not_metrics(self, output, metric_name, help_text, increments):
     def assert_outputs(self, outputs, metric_name, help_text, increments, compressed):
         self.assertEqual(len(outputs), 2)
         response_start = outputs[0]
-        self.assertEqual(response_start['type'], 'http.response.start')
+        self.assertEqual(response_start["type"], "http.response.start")
         response_body = outputs[1]
-        self.assertEqual(response_body['type'], 'http.response.body')
+        self.assertEqual(response_body["type"], "http.response.body")
         # Status code
-        self.assertEqual(response_start['status'], 200)
+        self.assertEqual(response_start["status"], 200)
         # Headers
         num_of_headers = 2 if compressed else 1
-        self.assertEqual(len(response_start['headers']), num_of_headers)
-        self.assertIn((b"Content-Type", CONTENT_TYPE_PLAIN_0_0_4.encode('utf8')), response_start['headers'])
+        self.assertEqual(len(response_start["headers"]), num_of_headers)
+        self.assertIn(
+            (b"Content-Type", CONTENT_TYPE_PLAIN_0_0_4.encode("utf8")),
+            response_start["headers"],
+        )
         if compressed:
-            self.assertIn((b"Content-Encoding", b"gzip"), response_start['headers'])
+            self.assertIn((b"Content-Encoding", b"gzip"), response_start["headers"])
         # Body
         if compressed:
-            output = gzip.decompress(response_body['body']).decode('utf8')
+            output = gzip.decompress(response_body["body"]).decode("utf8")
         else:
-            output = response_body['body'].decode('utf8')
+            output = response_body["body"].decode("utf8")
 
         self.assert_metrics(output, metric_name, help_text, increments)
 
@@ -136,7 +128,9 @@ def validate_metrics(self, metric_name, help_text, increments):
         self.send_default_request()
         # Assert outputs
         outputs = self.get_all_output()
-        self.assert_outputs(outputs, metric_name, help_text, increments, compressed=False)
+        self.assert_outputs(
+            outputs, metric_name, help_text, increments, compressed=False
+        )
 
     def test_report_metrics_1(self):
         self.validate_metrics("counter", "A counter", 2)
@@ -163,7 +157,9 @@ def test_gzip(self):
         self.send_input({"type": "http.request", "body": b""})
         # Assert outputs are compressed.
         outputs = self.get_all_output()
-        self.assert_outputs(outputs, metric_name, help_text, increments, compressed=True)
+        self.assert_outputs(
+            outputs, metric_name, help_text, increments, compressed=True
+        )
 
     def test_gzip_disabled(self):
         # Increment a metric.
@@ -179,16 +175,20 @@ def test_gzip_disabled(self):
         self.send_input({"type": "http.request", "body": b""})
         # Assert outputs are not compressed.
         outputs = self.get_all_output()
-        self.assert_outputs(outputs, metric_name, help_text, increments, compressed=False)
+        self.assert_outputs(
+            outputs, metric_name, help_text, increments, compressed=False
+        )
 
     def test_openmetrics_encoding(self):
         """Response content type is application/openmetrics-text when appropriate Accept header is in request"""
         app = make_asgi_app(self.registry)
         self.seed_app(app)
-        self.scope["headers"] = [(b"Accept", b"application/openmetrics-text; version=1.0.0")]
+        self.scope["headers"] = [
+            (b"Accept", b"application/openmetrics-text; version=1.0.0")
+        ]
         self.send_input({"type": "http.request", "body": b""})
 
-        content_type = self.get_response_header_value('Content-Type').split(";")[0]
+        content_type = self.get_response_header_value("Content-Type").split(";")[0]
         assert content_type == "application/openmetrics-text"
 
     def test_plaintext_encoding(self):
@@ -197,29 +197,28 @@ def test_plaintext_encoding(self):
         self.seed_app(app)
         self.send_input({"type": "http.request", "body": b""})
 
-        content_type = self.get_response_header_value('Content-Type').split(";")[0]
+        content_type = self.get_response_header_value("Content-Type").split(";")[0]
         assert content_type == "text/plain"
 
     def test_qs_parsing(self):
         """Only metrics that match the 'name[]' query string param appear"""
 
         app = make_asgi_app(self.registry)
-        metrics = [
-            ("asdf", "first test metric", 1),
-            ("bsdf", "second test metric", 2)
-        ]
+        metrics = [("asdf", "first test metric", 1), ("bsdf", "second test metric", 2)]
 
         for m in metrics:
             self.increment_metrics(*m)
 
         for i_1 in range(len(metrics)):
             self.seed_app(app)
-            self.scope['query_string'] = f"name[]={metrics[i_1][0]}_total".encode("utf-8")
+            self.scope["query_string"] = f"name[]={metrics[i_1][0]}_total".encode(
+                "utf-8"
+            )
             self.send_default_request()
 
             outputs = self.get_all_output()
             response_body = outputs[1]
-            output = response_body['body'].decode('utf8')
+            output = response_body["body"].decode("utf8")
 
             self.assert_metrics(output, *metrics[i_1])
 
@@ -229,6 +228,4 @@ def test_qs_parsing(self):
 
                 self.assert_not_metrics(output, *metrics[i_2])
 
-            asyncio.new_event_loop().run_until_complete(
-                self.communicator.wait()
-            )
+            asyncio.new_event_loop().run_until_complete(self.communicator.wait())

tox.ini

@@ -3,6 +3,7 @@ envlist = coverage-clean,py{3.9,3.10,3.11,3.12,3.13,py3.9,3.9-nooptionals},cover
 
 [testenv]
 deps =
+    asgiref
     coverage
     pytest
     pytest-benchmark