tests

Author: ewdurbin

tests/unit/test_config.py

@@ -288,7 +288,7 @@ def __init__(self):
         whitenoise_serve_static=pretend.call_recorder(lambda *a, **kw: None),
         whitenoise_add_files=pretend.call_recorder(lambda *a, **kw: None),
         whitenoise_add_manifest=pretend.call_recorder(lambda *a, **kw: None),
-        scan=pretend.call_recorder(lambda categories, ignore: None),
+        scan=pretend.call_recorder(lambda categories, ignore=False: None),
         commit=pretend.call_recorder(lambda: None),
         add_view_deriver=pretend.call_recorder(lambda *a, **kw: None),
     )
@@ -429,6 +429,7 @@ def __init__(self):
             pretend.call(".cache"),
             pretend.call(".email"),
             pretend.call(".accounts"),
+            pretend.call("social_pyramid"),
             pretend.call(".macaroons"),
             pretend.call(".oidc"),
             pretend.call(".attestations"),
@@ -520,6 +521,7 @@ def __init__(self):
         pretend.call(
             categories=(
                 "pyramid",
+                "social_pyramid",
                 "warehouse",
             ),
             ignore=["warehouse.migrations.env", "warehouse.celery", "warehouse.wsgi"],

warehouse/config.py

@@ -36,7 +36,7 @@
 
 from warehouse.authnz import Permissions
 from warehouse.constants import MAX_FILESIZE, MAX_PROJECT_SIZE, ONE_GIB, ONE_MIB
-from warehouse.db import ModelBase, Session
+from warehouse.db import ModelBase, Session, metadata
 from warehouse.utils.static import ManifestCacheBuster
 from warehouse.utils.wsgi import ProxyFixer, VhmRootRemover
 
@@ -828,8 +828,8 @@ def configure(settings=None):
     config.registry.settings["SOCIAL_AUTH_USER_MODEL"] = (
         "warehouse.accounts.models.User"
     )
-    init_social(config, ModelBase, Session)
-    config.scan("social_pyramid")
+    if "social_auth_usersocialauth" not in metadata.tables:
+        init_social(config, ModelBase, Session)
 
     # Register support for Macaroon based authentication
     config.include(".macaroons")
@@ -961,6 +961,7 @@ def configure(settings=None):
     config.scan(
         categories=(
             "pyramid",
+            "social_pyramid",
             "warehouse",
         ),
         ignore=["warehouse.migrations.env", "warehouse.celery", "warehouse.wsgi"],