Revert mocking change to GitHub tests. Changes focused on that can be done at another time

Author: th3coop

tests/unit/oidc/test_views.py

@@ -500,6 +500,8 @@ def test_mint_token_no_pending_publisher_ok(
     publisher = GitHubPublisherFactory()
     monkeypatch.setattr(publisher.__class__, "projects", [project])
     publisher.publisher_url = pretend.call_recorder(lambda **kw: "https://fake/url")
+    # NOTE: Can't set __str__ using pretend.stub()
+    monkeypatch.setattr(publisher.__class__, "__str__", lambda s: "fakespecifier")
 
     def _find_publisher(claims, pending=False):
         if pending:
@@ -544,7 +546,7 @@ def find_service(iface, **kw):
     assert macaroon_service.create_macaroon.calls == [
         pretend.call(
             "fakedomain",
-            f"OpenID token: example.yml ({datetime.fromtimestamp(0).isoformat()})",
+            f"OpenID token: fakespecifier ({datetime.fromtimestamp(0).isoformat()})",
             [
                 caveats.OIDCPublisher(
                     oidc_publisher_id=str(publisher.id),

warehouse/oidc/models/github.py

@@ -269,6 +269,7 @@ def reify(self, session):
         Returns a `GitHubPublisher` for this `PendingGitHubPublisher`,
         deleting the `PendingGitHubPublisher` in the process.
         """
+
         maybe_publisher = (
             session.query(GitHubPublisher)
             .filter(