tests: fix settings (bug 1894467) (#51)

- modify settings import to django.conf throughout project
- add test_settings module
- point pytest to new test_settings module

pyproject.toml

@@ -34,4 +34,4 @@ build-backend = "setuptools.build_meta"
 where = ["src"]
 
 [tool.pytest.ini_options]
-DJANGO_SETTINGS_MODULE = "lando.settings"
+DJANGO_SETTINGS_MODULE = "lando.test_settings"

src/lando/api/legacy/api/stacks.py

@@ -4,7 +4,7 @@
 import logging
 import urllib.parse
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.commit_message import format_commit_message
 from lando.api.legacy.decorators import require_phabricator_api_key
 from lando.api.legacy.phabricator import PhabricatorClient

src/lando/api/legacy/api/transplants.py

@@ -8,7 +8,7 @@
 
 import kombu
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy import auth
 from lando.api.legacy.commit_message import format_commit_message
 from lando.api.legacy.decorators import require_phabricator_api_key

src/lando/api/legacy/api/try_push.py

@@ -8,7 +8,7 @@
 import io
 import logging
 
-from lando import settings
+from django.conf import settings
 from lando.api import auth
 from lando.api.legacy.hgexports import (
     GitPatchHelper,

src/lando/api/legacy/api/uplift.py

@@ -4,7 +4,7 @@
 
 import logging
 
-from lando import settings
+from django.conf import settings
 from lando.api import auth
 from lando.api.legacy.decorators import require_phabricator_api_key
 from lando.api.legacy.phabricator import PhabricatorClient

src/lando/api/legacy/auth.py

@@ -18,7 +18,7 @@
 from django.core.cache import cache
 from jose import jwt
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.mocks.auth import MockAuth0
 from lando.api.legacy.repos import AccessGroup
 from lando.api.legacy.systems import Subsystem

src/lando/api/legacy/bmo.py

@@ -4,7 +4,7 @@
 
 import requests
 
-from lando import settings
+from django.conf import settings
 
 
 def bmo_uplift_endpoint() -> str:

src/lando/api/legacy/cache.py

@@ -10,7 +10,7 @@
 from flask_caching.backends.rediscache import RedisCache
 from redis import RedisError
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.redis import SuppressRedisFailure
 from lando.api.legacy.systems import Subsystem
 

src/lando/api/legacy/decorators.py

@@ -6,7 +6,7 @@
     Callable,
 )
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.phabricator import PhabricatorClient
 from lando.main.support import problem, request
 

src/lando/api/legacy/phabricator.py

@@ -24,7 +24,7 @@
 
 import requests
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)

src/lando/api/legacy/repos.py

@@ -14,7 +14,7 @@
 )
 from typing import Optional
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)

src/lando/api/legacy/sentry.py

@@ -6,7 +6,7 @@
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)

src/lando/api/legacy/smtp.py

@@ -5,7 +5,7 @@
 import smtplib
 from contextlib import contextmanager
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)

src/lando/api/legacy/tasks.py

@@ -6,7 +6,7 @@
 import ssl
 from typing import Optional
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.celery import celery
 from lando.api.legacy.email import make_failure_email
 from lando.api.legacy.phabricator import (

src/lando/api/legacy/transplants.py

@@ -10,7 +10,7 @@
 
 import requests
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.phabricator import (
     PhabricatorClient,
     PhabricatorRevisionStatus,

src/lando/api/legacy/treestatus.py

@@ -6,7 +6,7 @@
 
 import requests
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)

src/lando/api/legacy/ui.py

@@ -7,7 +7,7 @@
 import logging
 from urllib.parse import urlparse
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.systems import Subsystem
 
 logger = logging.getLogger(__name__)

src/lando/api/legacy/uplift.py

@@ -17,7 +17,7 @@
     Version,
 )
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy import bmo
 from lando.api.legacy.phabricator import PhabricatorClient
 from lando.api.legacy.phabricator_patch import patch_to_changes

src/lando/api/tests/conftest.py

@@ -17,7 +17,7 @@
 from django.http import JsonResponse as JSONResponse
 from django.test import Client
 
-from lando import settings
+from django.conf import settings
 from lando.api.legacy.mocks.auth import TEST_JWKS, MockAuth0
 from lando.api.legacy.phabricator import PhabricatorClient
 from lando.api.legacy.projects import (

src/lando/jinja.py

@@ -3,7 +3,7 @@
 from django.utils.html import escape
 
 from jinja2 import Environment
-from lando import settings
+from django.conf import settings
 from lando.ui.legacy.forms import UserSettingsForm
 
 import datetime

src/lando/main/models/base.py

@@ -10,7 +10,7 @@
 from django.db import models
 from django.db import connection
 
-from lando import settings
+from django.conf import settings
 from lando.utils import GitPatchHelper
 
 logger = logging.getLogger(__name__)

src/lando/settings.py

@@ -150,7 +150,6 @@
 OIDC_OP_AUTHORIZATION_ENDPOINT = f"{OIDC_DOMAIN}/authorize"
 OIDC_REDIRECT_REQUIRE_HTTPS = True
 
-OIDC_DOMAIN = os.getenv("OIDC_DOMAIN")
 OIDC_RP_CLIENT_ID = os.getenv("OIDC_RP_CLIENT_ID")
 OIDC_RP_CLIENT_SECRET = os.getenv("OIDC_RP_CLIENT_SECRET")
 

src/lando/test_settings.py

@@ -0,0 +1,16 @@
+from lando.settings import *
+
+
+OIDC_DOMAIN = "lando-api.auth0.test"
+OIDC_OP_TOKEN_ENDPOINT = f"{OIDC_DOMAIN}/oauth/token"
+OIDC_OP_USER_ENDPOINT = f"{OIDC_DOMAIN}/userinfo"
+OIDC_OP_AUTHORIZATION_ENDPOINT = f"{OIDC_DOMAIN}/authorize"
+OIDC_REDIRECT_REQUIRE_HTTPS = True
+
+OIDC_IDENTIFIER = "lando-api"  # Added for compatibility with tests, should not be needed.
+GITHUB_ACCESS_TOKEN = ""
+PHABRICATOR_URL = "http://phabricator.test"
+PHABRICATOR_ADMIN_API_KEY = "api-thiskeymustbe32characterslen"
+PHABRICATOR_UNPRIVILEGED_API_KEY = "api-thiskeymustbe32characterslen"
+CELERY_TASK_ALWAYS_EAGER = True
+ENVIRONMENT = "test"