Skip to content

Commit a8bc7a5

Browse files
committed
fixes test_settings
1 parent 5091270 commit a8bc7a5

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.env-devel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,16 @@ DIRECTOR_DEFAULT_MAX_MEMORY=2_147_483_648
6969
DIRECTOR_DEFAULT_MAX_NANO_CPUS=1_000_000_000
7070
DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
7171
DIRECTOR_HOST=director
72+
DIRECTOR_LOGLEVEL=INFO
73+
DIRECTOR_MONITORING_ENABLED=True
7274
DIRECTOR_PORT=8000
75+
DIRECTOR_PUBLISHED_HOST_NAME=
7376
DIRECTOR_REGISTRY_CACHING_TTL=900
7477
DIRECTOR_REGISTRY_CACHING=True
78+
DIRECTOR_SELF_SIGNED_SSL_FILENAME=
79+
DIRECTOR_SELF_SIGNED_SSL_SECRET_ID=
80+
DIRECTOR_SELF_SIGNED_SSL_SECRET_NAME=
81+
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS=
7582

7683
EFS_USER_ID=8006
7784
EFS_USER_NAME=efs
@@ -173,6 +180,7 @@ REDIS_SECURE=false
173180
REDIS_USER=null
174181

175182
REGISTRY_AUTH=True
183+
REGISTRY_PATH=""
176184
REGISTRY_PW=adminadminadmin
177185
REGISTRY_SSL=True
178186
REGISTRY_URL=registry.osparc-master.speag.com

services/director/tests/test_core_settings.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ def test_valid_web_application_settings(app_environment: EnvVarsDict):
2121

2222
assert settings == ApplicationSettings.create_from_envs()
2323

24-
assert app_environment["DIRECTOR_DEBUG"] == settings.DIRECTOR_DEBUG
24+
assert (
25+
app_environment["DIRECTOR_DEFAULT_MAX_MEMORY"]
26+
== settings.DIRECTOR_DEFAULT_MAX_MEMORY
27+
)

services/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ services:
256256
DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS: ${DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS}
257257
DIRECTOR_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
258258
EXTRA_HOSTS_SUFFIX: undefined
259-
LOGLEVEL: ${LOG_LEVEL:-WARNING}
260-
MONITORING_ENABLED: ${MONITORING_ENABLED:-True}
261-
PUBLISHED_HOST_NAME: ${MACHINE_FQDN}
259+
DIRECTOR_LOGLEVEL: ${DIRECTOR_LOGLEVEL}
260+
DIRECTOR_MONITORING_ENABLED: ${DIRECTOR_MONITORING_ENABLED}
261+
DIRECTOR_PUBLISHED_HOST_NAME: ${DIRECTOR_PUBLISHED_HOST_NAME}
262262
POSTGRES_DB: ${POSTGRES_DB}
263263
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
264264
POSTGRES_HOST: ${POSTGRES_HOST}

0 commit comments

Comments
 (0)