workaround in conftest for pytest.ini overriding all our env variables

This commit is contained in:
Kenneth Kehl
2024-04-29 11:06:25 -07:00
parent e50b4bb5f7
commit bc72288d4d
2 changed files with 12 additions and 6 deletions

View File

@@ -132,11 +132,11 @@ jobs:
env:
API_HOST_NAME: https://notify-api-staging.app.cloud.gov/
# API_HOST_NAME: http://localhost:6011
DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
SECRET_KEY: ${{ secrets.SECRET_KEY }}
ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
ADMIN_CLIENT_USERNAME: notify-admin
NOTIFY_ENVIRONMENT: e2etest
E2E_DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
E2E_SECRET_KEY: ${{ secrets.SECRET_KEY }}
E2E_ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
E2E_ADMIN_CLIENT_USERNAME: notify-admin
E2E_NOTIFY_ENVIRONMENT: e2etest
NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}

View File

@@ -89,7 +89,13 @@ def end_to_end_context(browser):
return context
def pytest_generate_tests(metafunc):
os.environ['DANGEROUS_SALT'] = 'blahblahdiddiblah'
os.environ['DANGEROUS_SALT'] = os.getenv('E2E_DANGEROUS_SALT')
os.environ['SECRET_KEY'] = os.getenv('E2E_SECRET_KEY')
os.environ['ADMIN_CLIENT_SECRET'] = os.getenv('E2E_ADMIN_CLIENT_SECRET')
os.environ['ADMIN_CLIENT_USERNAME'] = os.getenv('E2E_ADMIN_CLIENT_USERNAME')
os.environ['NOTIFY_ENVIRONMENT'] = os.getenv('E2E_NOTIFY_ENVIRONMENT')
@pytest.fixture()