Merge pull request #538 from py-cov-action/fix-ci

Author: ewjoachim

coverage_comment/main.py

@@ -33,20 +33,22 @@ def main():
         log.info("Starting action")
         config = settings.Config.from_environ(environ=os.environ)
 
-        github_session = httpx.Client(
-            base_url=config.GITHUB_BASE_URL,
-            follow_redirects=True,
-            headers={"Authorization": f"token {config.GITHUB_TOKEN}"},
-        )
-        http_session = httpx.Client()
         git = subprocess.Git()
 
-        exit_code = action(
-            config=config,
-            github_session=github_session,
-            http_session=http_session,
-            git=git,
-        )
+        with (
+            httpx.Client(
+                base_url=config.GITHUB_BASE_URL,
+                follow_redirects=True,
+                headers={"Authorization": f"token {config.GITHUB_TOKEN}"},
+            ) as github_session,
+            httpx.Client() as http_session,
+        ):
+            exit_code = action(
+                config=config,
+                github_session=github_session,
+                http_session=http_session,
+                git=git,
+            )
 
         log.info("Ending action")
         sys.exit(exit_code)

tests/end_to_end/conftest.py

@@ -11,6 +11,7 @@
 import subprocess
 import time
 
+import httpx
 import pytest
 import tenacity
 
@@ -387,3 +388,9 @@ def f(line):
         git("commit", "-m", "improve coverage")
 
     return f
+
+
+@pytest.fixture
+def http_client():
+    with httpx.Client() as client:
+        yield client

tests/end_to_end/test_all.py

@@ -2,7 +2,6 @@
 
 import base64
 
-import httpx
 import pytest
 
 
@@ -24,6 +23,7 @@ def test_public_repo(
     token_other,
     gh_create_fork,
     gh_other_username,
+    http_client,
 ):
     # Create a GitHub repo, make it public
     gh_create_repo("--public")
@@ -60,14 +60,12 @@ def test_public_repo(
     # - coverage branch readme url
     assert len(links) == 5
 
-    client = httpx.Client()
-
     # Check that all 5 links are valid and lead to a 200
     # It's made this way to avoid hardcoding links in the test, because I assume
     # they'll be evolving.
     number_of_svgs = 0
     for link in links:
-        response = client.get(link)
+        response = http_client.get(link)
         response.raise_for_status()
         number_of_svgs += int(response.text.startswith("<svg"))
 
@@ -81,7 +79,7 @@ def test_public_repo(
     raw_url_prefix = f"https://github.com/{repo_full_name}/raw/python-coverage-comment-action-data-my-great-project"
 
     readme_url = f"{raw_url_prefix}/README.md"
-    response = client.get(readme_url, follow_redirects=True)
+    response = http_client.get(readme_url, follow_redirects=True)
     response.raise_for_status()
     # And all previously found links should be present
     readme = response.text
@@ -91,13 +89,13 @@ def test_public_repo(
     # And while we're at it, there are 2 other files we want to check in this
     # branch. Once again, trying to avoid hardcoding too many specifics, that's what
     # unit tests are for.
-    data = client.get(f"{raw_url_prefix}/data.json", follow_redirects=True).json()
+    data = http_client.get(f"{raw_url_prefix}/data.json", follow_redirects=True).json()
     assert "coverage" in data
     assert "raw_data" in data
     assert "meta" in data["raw_data"]
     assert "coverage_path" in data
 
-    endpoint = client.get(
+    endpoint = http_client.get(
         f"{raw_url_prefix}/endpoint.json", follow_redirects=True
     ).json()
     assert "schemaVersion" in endpoint