diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 60a566ffb..da5ae9fb4 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -9,6 +9,7 @@ services: environment: POSTGRES_USER: 'postgres' POSTGRES_DB: 'elasticapm_test' + POSTGRES_PASSWORD: 'postgres' volumes: - pypgdata:/var/lib/postgresql/data healthcheck: diff --git a/tests/instrumentation/asyncio/aiopg_tests.py b/tests/instrumentation/asyncio/aiopg_tests.py index d06a71e8f..64796f92d 100644 --- a/tests/instrumentation/asyncio/aiopg_tests.py +++ b/tests/instrumentation/asyncio/aiopg_tests.py @@ -51,10 +51,11 @@ def dsn(): - return "dbname={database} user={user} host={host} port={port}".format( + return "dbname={database} user={user} password={password} host={host} port={port}".format( **{ "database": os.environ.get("POSTGRES_DB", "elasticapm_test"), "user": os.environ.get("POSTGRES_USER", "postgres"), + "password": os.environ.get("POSTGRES_PASSWORD", "postgres"), "host": os.environ.get("POSTGRES_HOST", "localhost"), "port": os.environ.get("POSTGRES_PORT", "5432"), } diff --git a/tests/instrumentation/psycopg2_tests.py b/tests/instrumentation/psycopg2_tests.py index ecade3574..4045968b7 100644 --- a/tests/instrumentation/psycopg2_tests.py +++ b/tests/instrumentation/psycopg2_tests.py @@ -63,6 +63,7 @@ def connect_kwargs(): return { "database": os.environ.get("POSTGRES_DB", "elasticapm_test"), "user": os.environ.get("POSTGRES_USER", "postgres"), + "password": os.environ.get("POSTGRES_PASSWORD", "postgres"), "host": os.environ.get("POSTGRES_HOST", None), "port": os.environ.get("POSTGRES_PORT", None), } diff --git a/tests/instrumentation/pyodbc_tests.py b/tests/instrumentation/pyodbc_tests.py index 1f8769ab6..a9d36fd80 100644 --- a/tests/instrumentation/pyodbc_tests.py +++ b/tests/instrumentation/pyodbc_tests.py @@ -45,9 +45,10 @@ @pytest.yield_fixture(scope="function") def pyodbc_postgres_connection(request): - conn_str = ("DRIVER={PostgreSQL Unicode};" "DATABASE=%s;" "UID=%s;" "SERVER=%s;" "PORT=%s;") % ( + conn_str = ("DRIVER={PostgreSQL Unicode};" "DATABASE=%s;" "UID=%s;" "PASSWORD=%s;" "SERVER=%s;" "PORT=%s;") % ( os.environ.get("POSTGRES_DB", "elasticapm_test"), os.environ.get("POSTGRES_USER", "postgres"), + os.environ.get("POSTGRES_PASSWORD", "postgres"), os.environ.get("POSTGRES_HOST", None), os.environ.get("POSTGRES_PORT", None), ) diff --git a/tests/scripts/envs/aiopg.sh b/tests/scripts/envs/aiopg.sh index 076da0e4b..cc503262c 100644 --- a/tests/scripts/envs/aiopg.sh +++ b/tests/scripts/envs/aiopg.sh @@ -2,6 +2,7 @@ export PYTEST_MARKER="-m aiopg" export DOCKER_DEPS="postgres" export POSTGRES_HOST="postgres" export POSTGRES_USER="postgres" +export POSTGRES_PASSWORD="postgres" export POSTGRES_DB="elasticapm_test" export POSTGRES_HOST="postgres" export POSTGRES_PORT="5432" diff --git a/tests/scripts/envs/psycopg2.sh b/tests/scripts/envs/psycopg2.sh index 50f440409..b20b30086 100644 --- a/tests/scripts/envs/psycopg2.sh +++ b/tests/scripts/envs/psycopg2.sh @@ -2,6 +2,7 @@ export PYTEST_MARKER="-m psycopg2" export DOCKER_DEPS="postgres" export POSTGRES_HOST="postgres" export POSTGRES_USER="postgres" +export POSTGRES_PASSWORD="postgres" export POSTGRES_DB="elasticapm_test" export POSTGRES_HOST="postgres" export POSTGRES_PORT="5432" diff --git a/tests/scripts/envs/pyodbc.sh b/tests/scripts/envs/pyodbc.sh index 76948c8fc..73096382b 100644 --- a/tests/scripts/envs/pyodbc.sh +++ b/tests/scripts/envs/pyodbc.sh @@ -2,6 +2,7 @@ export PYTEST_MARKER="-m pyodbc" export DOCKER_DEPS="postgres" export POSTGRES_HOST="postgres" export POSTGRES_USER="postgres" +export POSTGRES_PASSWORD="postgres" export POSTGRES_DB="elasticapm_test" export POSTGRES_HOST="postgres" export POSTGRES_PORT="5432"