@@ -251,19 +251,19 @@ def expected_dynamic_sidecar_spec(
251251 "NODE_PORTS_400_REQUEST_TIMEOUT_ATTEMPTS" : "3" ,
252252 "DYNAMIC_SIDECAR_LOG_LEVEL" : "DEBUG" ,
253253 "DY_DEPLOYMENT_REGISTRY_SETTINGS" : (
254- '{"REGISTRY_AUTH": false, "REGISTRY_PATH": null, '
255- '"REGISTRY_URL": "foo.bar.com", "REGISTRY_USER": '
256- '"test", "REGISTRY_PW": "test", "REGISTRY_SSL": false}'
254+ '{"REGISTRY_AUTH":false,"REGISTRY_PATH":null,'
255+ '"REGISTRY_URL":"foo.bar.com","REGISTRY_USER":'
256+ '"test","REGISTRY_PW":"test","REGISTRY_SSL":false}'
257257 ),
258258 "DY_DOCKER_HUB_REGISTRY_SETTINGS" : "null" ,
259259 "DY_SIDECAR_AWS_S3_CLI_SETTINGS" : (
260- '{"AWS_S3_CLI_S3": {"S3_ACCESS_KEY": "12345678", "S3_BUCKET_NAME": "simcore", '
261- '"S3_ENDPOINT": "http://172.17.0.1:9001", "S3_REGION": "us-east-1", "S3_SECRET_KEY": "12345678"}}'
260+ '{"AWS_S3_CLI_S3":{"S3_ACCESS_KEY":"12345678","S3_BUCKET_NAME":"simcore",'
261+ '"S3_ENDPOINT":"http://172.17.0.1:9001/", "S3_REGION":"us-east-1","S3_SECRET_KEY":"12345678"}}'
262262 ),
263263 "DY_SIDECAR_CALLBACKS_MAPPING" : (
264- '{"metrics": {"service": "rt-web", "command": "ls", "timeout": 1.0}, "before_shutdown"'
265- ': [{"service": "rt-web", "command": "ls", "timeout": 1.0}, {"service": "s4l-core", '
266- '"command": ["ls", "-lah"], "timeout": 1.0}], "inactivity": null}'
264+ '{"metrics":{"service":"rt-web","command":"ls","timeout":1.0},"before_shutdown"'
265+ ':[{"service":"rt-web","command":"ls","timeout":1.0},{"service":"s4l-core",'
266+ '"command":["ls","-lah"],"timeout":1.0}],"inactivity":null}'
267267 ),
268268 "DY_SIDECAR_SERVICE_KEY" : "simcore/services/dynamic/3dviewer" ,
269269 "DY_SIDECAR_SERVICE_VERSION" : "2.4.5" ,
@@ -579,13 +579,13 @@ async def test_merge_dynamic_sidecar_specs_with_user_specific_specs(
579579 for key in ["DY_SIDECAR_STATE_EXCLUDE" , "DY_SIDECAR_STATE_PATHS" ]:
580580 # this is a json of a list
581581 assert isinstance (
582- sorted_dict ["TaskTemplate " ]["ContainerSpec " ]["Env " ][key ], str
582+ sorted_dict ["task_template " ]["container_spec " ]["env " ][key ], str
583583 )
584584 unsorted_list = json .loads (
585- sorted_dict ["TaskTemplate " ]["ContainerSpec " ]["Env " ][key ]
585+ sorted_dict ["task_template " ]["container_spec " ]["env " ][key ]
586586 )
587587 assert isinstance (unsorted_list , list )
588- sorted_dict ["TaskTemplate " ]["ContainerSpec " ]["Env " ][key ] = json .dumps (
588+ sorted_dict ["task_template " ]["container_spec " ]["env " ][key ] = json .dumps (
589589 unsorted_list .sort ()
590590 )
591591 assert dynamic_sidecar_spec_dict == expected_dynamic_sidecar_spec_dict
0 commit comments