Skip to content

fix: remove fallback in count_running_containers causing flaky warm container tests #8651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnusunny merged 2 commits into from
Feb 13, 2026
Merged

fix: remove fallback in count_running_containers causing flaky warm container tests #8651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b8552d
fix: remove fallback in count_running_containers causing flaky warm c…
bnusunny Feb 13, 2026
b4ccf5d
Merge branch 'develop' into fix/warm-containers-count-clean
bnusunny Feb 13, 2026
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
15 changes: 3 additions & 12 deletions tests/integration/local/start_api/test_start_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2220,35 +2220,26 @@ def setUp(self):

def count_running_containers(self):
"""Count containers created by this test using Docker client directly."""
# Use Docker client to find containers with SAM CLI labels
try:
# Get running containers with SAM CLI lambda container label
sam_containers = self.docker_client.containers.list(
all=False, filters={"label": "sam.cli.container.type=lambda"}
)

# Filter by our test's mode environment variable if possible
test_containers = []
for container in sam_containers:
try:
container.reload()
env_vars = container.attrs.get("Config", {}).get("Env", [])
for env_var in env_vars:
if env_var.startswith("MODE=") and self.mode_env_variable in env_var:
if env_var == f"MODE={self.mode_env_variable}":
test_containers.append(container)
break
except Exception:
continue

# If we found containers with our mode variable, return that count
if test_containers:
return len(test_containers)
return len(test_containers)

# Otherwise, return all SAM containers (fallback)
return len(sam_containers)

except Exception as e:
# If we can't access Docker client, fall back to 0
except Exception:
return 0

def _parse_container_ids_from_output(self):
Expand Down
15 changes: 3 additions & 12 deletions tests/integration/local/start_lambda/test_start_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,35 +403,26 @@ def setUp(self):

def count_running_containers(self):
"""Count containers created by this test using Docker client directly."""
# Use Docker client to find containers with SAM CLI labels
try:
# Get running containers with SAM CLI lambda container label
sam_containers = self.docker_client.containers.list(
all=False, filters={"label": "sam.cli.container.type=lambda"}
)

# Filter by our test's mode environment variable if possible
test_containers = []
for container in sam_containers:
try:
container.reload()
env_vars = container.attrs.get("Config", {}).get("Env", [])
for env_var in env_vars:
if env_var.startswith("MODE=") and self.mode_env_variable in env_var:
if env_var == f"MODE={self.mode_env_variable}":
test_containers.append(container)
break
except Exception:
continue

# If we found containers with our mode variable, return that count
if test_containers:
return len(test_containers)
return len(test_containers)

# Otherwise, return all SAM containers (fallback)
return len(sam_containers)

except Exception as e:
# If we can't access Docker client, fall back to 0
except Exception:
return 0

def _parse_container_ids_from_output(self):
Expand Down
Loading
⚡