Replacing Fixtures with Constants

Author: dakshbhayana11811137

tests/conftest.py

@@ -68,8 +68,8 @@
 from .common.db import Session
 from .common.db.accounts import EmailFactory, UserFactory
 from .common.db.ip_addresses import IpAddressFactory
+from .common.constants import REMOTE_ADDR, REMOTE_ADDR_HASHED
 
-from common.constants import REMOTE_ADDR, REMOTE_ADDR_HASHED, REMOTE_ADDR_SALTED
 
 _HERE = Path(__file__).parent.resolve()
 _FIXTURES = _HERE / "_fixtures"
@@ -214,7 +214,7 @@ def pyramid_services(
 
 
 @pytest.fixture
-def pyramid_request(pyramid_services, jinja, remote_addr, remote_addr_hashed):
+def pyramid_request(pyramid_services, jinja):
     pyramid.testing.setUp()
     dummy_request = pyramid.testing.DummyRequest()
     dummy_request.find_service = pyramid_services.find_service
@@ -438,7 +438,7 @@ def db_session(app_config):
 
 
 @pytest.fixture
-def user_service(db_session, metrics, remote_addr):
+def user_service(db_session, metrics):
     return account_services.DatabaseUserService(
         db_session, metrics=metrics, remote_addr=REMOTE_ADDR
     )
@@ -745,7 +745,7 @@ def tm():
 
 
 @pytest.fixture
-def webtest(app_config_dbsession_from_env, remote_addr, tm):
+def webtest(app_config_dbsession_from_env, tm):
     """
     This fixture yields a test app with an alternative Pyramid configuration,
     injecting the database session and transaction manager into the app.

tests/unit/accounts/test_forms.py

@@ -33,7 +33,8 @@
 from warehouse.captcha import recaptcha
 from warehouse.events.tags import EventTag
 from warehouse.utils.webauthn import AuthenticationRejectedError
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR
+
 
 class TestLoginForm:
     def test_validate(self):

tests/unit/accounts/test_security_policy.py

@@ -21,7 +21,8 @@
 from warehouse.accounts import UserContext, security_policy
 from warehouse.accounts.interfaces import IUserService
 from warehouse.utils.security_policy import AuthenticationMethod
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR
+
 
 class TestBasicAuthSecurityPolicy:
     def test_verify(self):

tests/unit/accounts/test_services.py

@@ -49,13 +49,14 @@
 
 from ...common.db.accounts import EmailFactory, UserFactory
 from ...common.db.ip_addresses import IpAddressFactory
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR
+
 
 class TestDatabaseUserService:
     def test_verify_service(self):
         assert verifyClass(IUserService, services.DatabaseUserService)
 
-    def test_service_creation(self, monkeypatch, remote_addr):
+    def test_service_creation(self, monkeypatch):
         crypt_context_obj = pretend.stub()
         crypt_context_cls = pretend.call_recorder(lambda **kwargs: crypt_context_obj)
         monkeypatch.setattr(services, "CryptContext", crypt_context_cls)
@@ -84,7 +85,7 @@ def test_service_creation(self, monkeypatch, remote_addr):
             )
         ]
 
-    def test_service_creation_ratelimiters(self, monkeypatch, remote_addr):
+    def test_service_creation_ratelimiters(self, monkeypatch):
         crypt_context_obj = pretend.stub()
         crypt_context_cls = pretend.call_recorder(lambda **kwargs: crypt_context_obj)
         monkeypatch.setattr(services, "CryptContext", crypt_context_cls)
@@ -119,7 +120,7 @@ def test_service_creation_ratelimiters(self, monkeypatch, remote_addr):
             )
         ]
 
-    def test_skips_ip_rate_limiter(self, user_service, metrics, remote_addr):
+    def test_skips_ip_rate_limiter(self, user_service, metrics):
         user = UserFactory.create()
         resets = pretend.stub()
         limiter = pretend.stub(
@@ -214,7 +215,7 @@ def test_check_password_user_rate_limited(self, user_service, metrics):
             ),
         ]
 
-    def test_check_password_ip_rate_limited(self, user_service, metrics, remote_addr):
+    def test_check_password_ip_rate_limited(self, user_service, metrics):
         user = UserFactory.create()
         resets = pretend.stub()
         limiter = pretend.stub(
@@ -382,7 +383,7 @@ def test_add_email_defaults_to_primary(self, user_service):
         assert not new_email2.primary
         assert not new_email2.verified
 
-    def test_add_email_rate_limited(self, user_service, metrics, remote_addr):
+    def test_add_email_rate_limited(self, user_service, metrics):
         resets = pretend.stub()
         limiter = pretend.stub(
             hit=pretend.call_recorder(lambda ip: None),
@@ -1128,7 +1129,7 @@ def test_unsafe_load_payload_signature_invalid(self, token_service):
         assert token_service.unsafe_load_payload(token) is None
 
 
-def test_database_login_factory(monkeypatch, pyramid_services, metrics, remote_addr):
+def test_database_login_factory(monkeypatch, pyramid_services, metrics):
     service_obj = pretend.stub()
     service_cls = pretend.call_recorder(lambda *a, **kw: service_obj)
     monkeypatch.setattr(services, "DatabaseUserService", service_cls)

tests/unit/email/test_init.py

@@ -26,7 +26,7 @@
 
 from ...common.db.accounts import EmailFactory, UserFactory
 from ...common.db.organizations import TeamFactory
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR
 
 @pytest.mark.parametrize(
     ("user", "address", "expected"),
@@ -74,7 +74,7 @@ def test_compute_recipient(user, address, expected):
         (None, None, "127.0.0.1", True),
     ],
 )
-def test_redact_ip(unauthenticated_userid, user, remote_addr, expected):
+def test_redact_ip(unauthenticated_userid, user, expected):
     user_email = pretend.stub(user_id="the_users_id")
 
     request = pretend.stub(

tests/unit/forklift/test_legacy.py

@@ -66,7 +66,7 @@
     ReleaseFactory,
     RoleFactory,
 )
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR
 
 
 def _get_tar_testdata(compression_type=""):
@@ -4398,7 +4398,6 @@ def test_upload_new_project_fails_ratelimited(
         db_request,
         project_service,
         failing_limiter,
-        remote_addr,
     ):
         user = UserFactory.create()
         EmailFactory.create(user=user)

tests/unit/manage/test_forms.py

@@ -23,7 +23,7 @@
 from warehouse.manage import forms
 
 from ...common.db.packaging import ProjectFactory
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR
 
 
 class TestCreateRoleForm:

tests/unit/oidc/test_views.py

@@ -40,7 +40,7 @@
 from warehouse.packaging import services
 from warehouse.packaging.models import Project
 from warehouse.rate_limiting.interfaces import IRateLimiter
-from common.constants import DUMMY_GITHUB_OIDC_JWT, DUMMY_ACTIVESTATE_OIDC_JWT
+from ...common.constants import DUMMY_GITHUB_OIDC_JWT, DUMMY_ACTIVESTATE_OIDC_JWT
 
 
 def test_ratelimiters():
@@ -193,7 +193,7 @@ def find_service(self, *a, **kw):
 
 
 def test_mint_token_from_oidc_jwt_decode_leaky_exception(
-    monkeypatch, dummy_github_oidc_jwt: str
+    monkeypatch
 ):
     class Request:
         def __init__(self):
@@ -309,7 +309,6 @@ def test_mint_token_from_oidc_creates_expected_service(
 
 
 def test_mint_token_from_trusted_publisher_verify_jwt_signature_fails(
-    dummy_github_oidc_jwt,
 ):
     oidc_service = pretend.stub(
         verify_jwt_signature=pretend.call_recorder(lambda token: None),
@@ -337,7 +336,7 @@ def test_mint_token_from_trusted_publisher_verify_jwt_signature_fails(
     ]
 
 
-def test_mint_token_trusted_publisher_lookup_fails(dummy_github_oidc_jwt):
+def test_mint_token_trusted_publisher_lookup_fails():
     claims = pretend.stub()
     message = "some message"
     oidc_service = pretend.stub(
@@ -375,7 +374,7 @@ def test_mint_token_trusted_publisher_lookup_fails(dummy_github_oidc_jwt):
     ]
 
 
-def test_mint_token_duplicate_token(dummy_github_oidc_jwt):
+def test_mint_token_duplicate_token():
     def find_publishers_mockup(_, pending: bool = False):
         if pending is False:
             raise errors.ReusedTokenError("some message")
@@ -407,7 +406,7 @@ def find_publishers_mockup(_, pending: bool = False):
 
 
 def test_mint_token_pending_publisher_project_already_exists(
-    db_request, dummy_github_oidc_jwt
+    db_request
 ):
     project = ProjectFactory.create()
     pending_publisher = PendingGitHubPublisherFactory.create(
@@ -445,8 +444,7 @@ def test_mint_token_pending_publisher_project_already_exists(
 
 def test_mint_token_from_oidc_pending_publisher_ok(
     monkeypatch,
-    db_request,
-    dummy_github_oidc_jwt,
+    db_request
 ):
     user = UserFactory.create()
 
@@ -501,7 +499,7 @@ def test_mint_token_from_oidc_pending_publisher_ok(
 
 
 def test_mint_token_from_pending_trusted_publisher_invalidates_others(
-    monkeypatch, db_request, dummy_github_oidc_jwt
+    monkeypatch, db_request
 ):
     time = pretend.stub(time=pretend.call_recorder(lambda: 0))
     monkeypatch.setattr(views, "time", time)
@@ -595,7 +593,7 @@ def test_mint_token_from_pending_trusted_publisher_invalidates_others(
     ],
 )
 def test_mint_token_no_pending_publisher_ok(
-    monkeypatch, db_request, claims_in_token, claims_input, dummy_github_oidc_jwt
+    monkeypatch, db_request, claims_in_token, claims_input
 ):
     time = pretend.stub(time=pretend.call_recorder(lambda: 0))
     monkeypatch.setattr(views, "time", time)
@@ -684,7 +682,7 @@ def find_service(iface, **kw):
 
 
 def test_mint_token_warn_constrain_environment(
-    monkeypatch, db_request, dummy_github_oidc_jwt
+    monkeypatch, db_request
 ):
     claims_in_token = {"ref": "someref", "sha": "somesha", "environment": "fakeenv"}
     claims_input = {"ref": "someref", "sha": "somesha"}
@@ -798,8 +796,7 @@ def find_service(iface, **kw):
 
 def test_mint_token_with_prohibited_name_fails(
     monkeypatch,
-    db_request,
-    dummy_github_oidc_jwt,
+    db_request
 ):
     prohibited_project_name = ProhibitedProjectFactory.create()
     user = UserFactory.create()
@@ -841,8 +838,7 @@ def test_mint_token_with_prohibited_name_fails(
 
 def test_mint_token_with_invalid_name_fails(
     monkeypatch,
-    db_request,
-    dummy_github_oidc_jwt,
+    db_request
 ):
     user = UserFactory.create()
     pending_publisher = PendingGitHubPublisherFactory.create(
@@ -917,7 +913,6 @@ def test_mint_token_github_reusable_workflow_metrics(
     claims_in_token,
     is_reusable,
     is_github,
-    dummy_github_oidc_jwt,
     metrics,
 ):
     time = pretend.stub(time=pretend.call_recorder(lambda: 0))

tests/unit/utils/test_wsgi.py

@@ -22,7 +22,7 @@
 from warehouse.utils import wsgi
 
 from ...common.db.ip_addresses import IpAddressFactory as DBIpAddressFactory
-from common.constants import REMOTE_ADDR
+from ...common.constants import REMOTE_ADDR, REMOTE_ADDR_SALTED, REMOTE_ADDR_HASHED
 
 
 class TestProxyFixer:
@@ -117,7 +117,7 @@ def test_missing_headers(self):
         assert resp is response
         assert app.calls == [pretend.call({}, start_response)]
 
-    def test_accepts_x_forwarded_headers(self, remote_addr_salted):
+    def test_accepts_x_forwarded_headers(self):
         response = pretend.stub()
         app = pretend.call_recorder(lambda e, s: response)
 
@@ -137,7 +137,7 @@ def test_accepts_x_forwarded_headers(self, remote_addr_salted):
                 {
                     "HTTP_SOME_OTHER_HEADER": "woop",
                     "REMOTE_ADDR": REMOTE_ADDR,
-                    "REMOTE_ADDR_HASHED": remote_addr_salted,
+                    "REMOTE_ADDR_HASHED": REMOTE_ADDR_SALTED,
                     "HTTP_HOST": "example.com",
                     "wsgi.url_scheme": "http",
                 },
@@ -161,7 +161,7 @@ def test_skips_x_forwarded_when_not_enough(self):
             pretend.call({"HTTP_SOME_OTHER_HEADER": "woop"}, start_response)
         ]
 
-    def test_selects_right_x_forwarded_value(self, remote_addr_salted):
+    def test_selects_right_x_forwarded_value(self):
         response = pretend.stub()
         app = pretend.call_recorder(lambda e, s: response)
 
@@ -183,7 +183,7 @@ def test_selects_right_x_forwarded_value(self, remote_addr_salted):
                 {
                     "HTTP_SOME_OTHER_HEADER": "woop",
                     "REMOTE_ADDR": REMOTE_ADDR,
-                    "REMOTE_ADDR_HASHED": remote_addr_salted,
+                    "REMOTE_ADDR_HASHED": REMOTE_ADDR_SALTED,
                     "HTTP_HOST": "example.com",
                     "wsgi.url_scheme": "http",
                 },
@@ -246,11 +246,11 @@ def test_ip_address_created(db_request):
     assert ip_address.geoip_info == {"city": "Anytown, ST"}
 
 
-def test_remote_addr_hashed(remote_addr_hashed):
-    environ = {"REMOTE_ADDR_HASHED": remote_addr_hashed}
+def test_remote_addr_hashed():
+    environ = {"REMOTE_ADDR_HASHED": REMOTE_ADDR_HASHED}
     request = pretend.stub(environ=environ)
 
-    assert wsgi._remote_addr_hashed(request) == remote_addr_hashed
+    assert wsgi._remote_addr_hashed(request) == REMOTE_ADDR_HASHED
 
 
 def test_remote_addr_hashed_missing():