Skip to content

Commit 78896f7

Browse files
committed
Fix Docker resource prefix in test infrastructure
Add DOCKER_RESSOURCE_PREFIX to generated settings.env and use hyphen separator instead of underscore for cleaner resource names.
1 parent 72dfa7a commit 78896f7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

tests/helpers/ref_instance.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,9 @@ def is_running(self) -> bool:
321321

322322
def _generate_settings_env(self) -> str:
323323
"""Generate the settings.env file content."""
324+
# Use test prefix for Docker resources so they can be identified and cleaned up
325+
# The trailing hyphen ensures clean resource names like "ref_e2e_...-entry-123"
326+
docker_prefix = f"{self.config.prefix}-"
324327
return f"""# Auto-generated settings for REF test instance: {self.config.prefix}
325328
DEBUG={1 if self.config.debug else 0}
326329
MAINTENANCE_ENABLED={1 if self.config.maintenance_enabled else 0}
@@ -333,6 +336,7 @@ def _generate_settings_env(self) -> str:
333336
SECRET_KEY={self.config.secret_key}
334337
SSH_TO_WEB_KEY={self.config.ssh_to_web_key}
335338
POSTGRES_PASSWORD={self.config.postgres_password}
339+
DOCKER_RESSOURCE_PREFIX={docker_prefix}
336340
"""
337341

338342
def _generate_docker_compose(self) -> str:

tests/test_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def to_env_dict(self) -> dict[str, str]:
134134
"SSH_TO_WEB_KEY": self.ssh_to_web_key,
135135
"SSH_HOST_PORT": str(self.ssh_port) if self.ssh_port != 0 else "2222",
136136
"DEBUG": "1",
137-
"DOCKER_RESSOURCE_PREFIX": f"{self.resource_prefix}_",
137+
"DOCKER_RESSOURCE_PREFIX": f"{self.resource_prefix}-",
138138
"INSTANCES_CGROUP_PARENT": "",
139139
"MAINTENANCE_ENABLED": "0",
140140
"DISABLE_TELEGRAM": "1",

0 commit comments

Comments
 (0)