Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

import os
import re
import socket
import string
import time
import uuid
Expand Down Expand Up @@ -2341,14 +2340,14 @@ def fixture_aws_credentials() -> Generator[None, None, None]:


@pytest.fixture(scope="session")
def moto_server() -> "ThreadedMotoServer":
def moto_server() -> Generator["ThreadedMotoServer", None, None]:
from moto.server import ThreadedMotoServer

server = ThreadedMotoServer(ip_address="localhost", port=5001)

# this will throw an exception if the port is already in use
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.bind((server._ip_address, server._port))
# Bind to port 0 so the OS assigns a free ephemeral port. A hardcoded port
# collides when tests run in parallel (e.g. on shared CI agents) or when a
# previous run leaves the port in TIME_WAIT, raising
# "OSError: [Errno 98] Address already in use".
server = ThreadedMotoServer(ip_address="localhost", port=0)

server.start()
yield server
Expand All @@ -2357,7 +2356,8 @@ def moto_server() -> "ThreadedMotoServer":

@pytest.fixture(scope="session")
def moto_endpoint_url(moto_server: "ThreadedMotoServer") -> str:
_url = f"http://{moto_server._ip_address}:{moto_server._port}"
host, port = moto_server.get_host_and_port()
_url = f"http://{host}:{port}"
return _url


Expand Down