Fix running tests with tox-docker 5.0.0

resultsdb/config.py

@@ -25,7 +25,7 @@
 
 
 def db_uri_for_testing():
-    postgres_port = os.getenv("POSTGRES_5432_TCP")
+    postgres_port = os.getenv("RESULTSDB_POSTGRES_PORT")
     if postgres_port:
         return f"postgresql+psycopg2://resultsdb:resultsdb@localhost:{postgres_port}/resultsdb"
 

tox.ini

@@ -3,9 +3,6 @@ envlist = py3,mypy
 requires =
     poetry
     tox-docker
-    # requests-2.32.0 breaks docker
-    # https://github.com/docker/docker-py/issues/3256
-    requests<2.32.0
 
 [pytest]
 minversion=2.0
@@ -40,20 +37,19 @@ setenv =
 docker = resultsdb-postgres
 commands =
     poetry run python -m pytest {posargs}
-setenv =
-    POSTGRES_5432_TCP = 15432
 passenv =
     DOCKER_HOST
     NO_CAN_HAS_POSTGRES
-    POSTGRES_5432_TCP
+    RESULTSDB_POSTGRES_PORT
 
 [docker:resultsdb-postgres]
 image = docker.io/library/postgres:14.7-alpine
 environment =
     POSTGRES_USER=resultsdb
     POSTGRES_DB=resultsdb
     POSTGRES_PASSWORD=resultsdb
-ports = 15432:5432/tcp
+expose =
+    RESULTSDB_POSTGRES_PORT=5432/tcp
 healthcheck_cmd = pg_isready --username postgres
 healthcheck_retries = 30
 healthcheck_timeout = 1