From 05e95de3b9736160b4229232903e86706fb782e1 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Mon, 20 Apr 2020 13:25:47 -0400 Subject: Remove ContainerizedPlatformContainer from types Also allow environment variables to specified via docker_config Issue-ID: DCAEGEN2-1791 Issue-ID: DCAEGEN2-2215 Change-Id: If6b3b206856031d3c2aa3a5f787c1be30bdc4afd Signed-off-by: Jack Lucas --- k8s/tests/test_tasks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'k8s/tests/test_tasks.py') diff --git a/k8s/tests/test_tasks.py b/k8s/tests/test_tasks.py index c6781bb..7f5d753 100644 --- a/k8s/tests/test_tasks.py +++ b/k8s/tests/test_tasks.py @@ -146,7 +146,7 @@ def test_enhance_docker_params(mockconfig): test_kwargs = { "docker_config": {}, "service_id": None } actual = tasks._enhance_docker_params(**test_kwargs) - assert actual == {'envs': {"SERVICE_TAGS": ""}, 'docker_config': {}, 'ports': [], 'volumes': [], "service_id": None } + assert actual == {'envs': {}, 'docker_config': {}, 'ports': [], 'volumes': [], "service_id": None } # Good - Test just docker config ports and volumes @@ -155,7 +155,7 @@ def test_enhance_docker_params(mockconfig): "service_id": None } actual = tasks._enhance_docker_params(**test_kwargs) - assert actual == {'envs': {"SERVICE_TAGS": ""}, 'docker_config': {'ports': ['1:1', '2:2'], + assert actual == {'envs': {}, 'docker_config': {'ports': ['1:1', '2:2'], 'volumes': [{'host': 'somewhere else', 'container': 'somewhere'}]}, 'ports': ['1:1', '2:2'], 'volumes': [{'host': 'somewhere else', 'container': 'somewhere'}], "service_id": None} @@ -169,7 +169,7 @@ def test_enhance_docker_params(mockconfig): "service_id": None } actual = tasks._enhance_docker_params(**test_kwargs) - assert actual == {'envs': {"SERVICE_TAGS": ""}, 'docker_config': {'ports': ['1:1', '2:2'], + assert actual == {'envs': {}, 'docker_config': {'ports': ['1:1', '2:2'], 'volumes': [{'host': 'somewhere else', 'container': 'somewhere'}]}, 'ports': ['1:1', '2:2', '3:3', '4:4'], 'volumes': [{'host': 'somewhere else', 'container': 'somewhere'}, {'host': 'nowhere else', 'container': @@ -181,7 +181,7 @@ def test_enhance_docker_params(mockconfig): "deployment_id": "abc" } actual = tasks._enhance_docker_params(**test_kwargs) - assert actual["envs"] == {"SERVICE_TAGS": "abc,zed"} + assert actual["envs"] == {} def test_notify_container(mockconfig): -- cgit 1.2.3-korg