Fix alchemy Mapper error in tests. Required bringing db_request back into the test

Author: th3coop

tests/unit/oidc/test_views.py

@@ -372,17 +372,19 @@ def test_mint_token_from_pending_trusted_publisher_invalidates_others(
 
 
 def test_mint_token_from_oidc_only_pending_publisher_fail(monkeypatch, db_request):
-    publisher = PendingGitHubPublisherFactory()
+    pending_publisher = PendingGitHubPublisherFactory()
 
     def _find_publisher(claims, pending=False):
-        return publisher
+        return pending_publisher
 
     oidc_service = pretend.stub(
         verify_jwt_signature=pretend.call_recorder(
             lambda token: {"ref": "someref", "sha": "somesha"}
         ),
         find_publisher=pretend.call_recorder(_find_publisher),
-        reify_pending_publisher=pretend.call_recorder(lambda *a, **kw: publisher),
+        reify_pending_publisher=pretend.call_recorder(
+            lambda *a, **kw: pending_publisher
+        ),
     )
 
     db_request.body = json.dumps(
@@ -445,7 +447,7 @@ def _find_publisher(claims, pending=False):
     ],
 )
 def test_mint_token_from_oidc_no_pending_publisher_ok(
-    monkeypatch, claims_in_token, claims_input
+    monkeypatch, db_request, claims_in_token, claims_input
 ):
     time = pretend.stub(time=pretend.call_recorder(lambda: 0))
     monkeypatch.setattr(views, "time", time)
@@ -456,15 +458,14 @@ def test_mint_token_from_oidc_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:
-            raise errors.InvalidPublisherError
+            return None
         else:
             return publisher
 
@@ -487,16 +488,19 @@ def find_service(iface, **kw):
             return macaroon_service
         assert False, iface
 
-    request = pretend.stub(
-        response=pretend.stub(status=None),
-        body=json.dumps({"token": "faketoken"}),
-        find_service=find_service,
-        domain="fakedomain",
-        remote_addr="0.0.0.0",
-        flags=pretend.stub(disallow_oidc=lambda *a: False),
-    )
+    # request = pretend.stub(
+    #     response=pretend.stub(status=None),
+    #     body=json.dumps({"token": "faketoken"}),
+    #     find_service=find_service,
+    #     domain="fakedomain",
+    #     remote_addr="0.0.0.0",
+    #     flags=pretend.stub(disallow_oidc=lambda *a: False),
+    # )
+    monkeypatch.setattr(db_request, "find_service", find_service)
+    monkeypatch.setattr(db_request, "body", json.dumps({"token": "faketoken"}))
+    monkeypatch.setattr(db_request, "domain", "fakedomain")
 
-    response = views.mint_token(oidc_service, request)
+    response = views.mint_token(oidc_service, db_request)
     assert response == {
         "success": True,
         "token": "raw-macaroon",
@@ -526,7 +530,7 @@ def find_service(iface, **kw):
     assert project.record_event.calls == [
         pretend.call(
             tag=EventTag.Project.ShortLivedAPITokenAdded,
-            request=request,
+            request=db_request,
             additional={
                 "expires": 900,
                 "publisher_name": "GitHub",

warehouse/oidc/services.py

@@ -294,7 +294,6 @@ def find_publisher(
             publisher = find_publisher_by_issuer(
                 self.db, self.issuer_url, signed_claims, pending=pending
             )
-
             publisher.verify_claims(signed_claims)
             self.metrics.increment(
                 "warehouse.oidc.find_publisher.ok",