From 3620c9faa8dad088ea87ea34f566b6a3c857b613 Mon Sep 17 00:00:00 2001 From: Stefan Nordhausen Date: Tue, 7 Jul 2015 15:57:37 +0200 Subject: [PATCH 1/3] Adapt to format change of pull request #14 in yadt-minion --- src/integrationtest/python/yadt_status_answer.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/integrationtest/python/yadt_status_answer.py b/src/integrationtest/python/yadt_status_answer.py index 64bcffa..562591c 100644 --- a/src/integrationtest/python/yadt_status_answer.py +++ b/src/integrationtest/python/yadt_status_answer.py @@ -61,11 +61,11 @@ - frontend-service: needs_services: [backend-service] state: $frontend_service_state - service_artefact: yit-frontend-service + service_artefact: [yit-frontend-service] toplevel_artefacts: [yit-config-$host] - backend-service: state: $backend_service_state - service_artefact: yit-backend-service + service_artefact: [yit-backend-service] toplevel_artefacts: [yit-config-$host] artefact_names_handled_by_yadt: - yit-frontend-service @@ -108,7 +108,7 @@ services: - backend-service: state: $backend_service_state - service_artefact: yit-backend-service + service_artefact: [yit-backend-service] needs_services: ['service://foo/bar'] artefact_names_handled_by_yadt: - yit-frontend-service @@ -150,11 +150,11 @@ - frontend-service: needs_services: [backend-service] state: $frontend_service_state - service_artefact: yit-frontend-service + service_artefact: [yit-frontend-service] toplevel_artefacts: [yit-config-$host] - backend-service: state: $backend_service_state - service_artefact: yit-backend-service + service_artefact: [yit-backend-service] toplevel_artefacts: [yit-config-$host] needs_artefacts: [yit-config-$host] From 217a735e6fc3cbf1c1e378e43197bf3d0829ae2a Mon Sep 17 00:00:00 2001 From: Stefan Nordhausen Date: Tue, 7 Jul 2015 16:05:55 +0200 Subject: [PATCH 2/3] Fix incorrect assertion --- src/unittest/python/components_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unittest/python/components_tests.py b/src/unittest/python/components_tests.py index 6190a95..bb5c144 100644 --- a/src/unittest/python/components_tests.py +++ b/src/unittest/python/components_tests.py @@ -245,4 +245,4 @@ def test_set_attrs_with_obsolete_yaml_services_format(self): host.set_attrs_from_data(data) self.assertEqual(len(host.services), 1) self.assertTrue("backend-service" in host.services) - self.assertTrue(host.services["backend-service"]["service_artefact"], "yit-backend-service") + self.assertEqual(host.services["backend-service"]["service_artefact"], "yit-backend-service") From c3e12f6397457b8851b996742f2e4323e6175468 Mon Sep 17 00:00:00 2001 From: Stefan Nordhausen Date: Tue, 7 Jul 2015 16:12:42 +0200 Subject: [PATCH 3/3] Adapt to format change of pull request #14 in yadt-minion --- src/unittest/python/components_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unittest/python/components_tests.py b/src/unittest/python/components_tests.py index bb5c144..d65235b 100644 --- a/src/unittest/python/components_tests.py +++ b/src/unittest/python/components_tests.py @@ -237,7 +237,7 @@ def test_set_attrs_with_obsolete_yaml_services_format(self): services: - backend-service: state: $backend_service_state - service_artefact: yit-backend-service + service_artefact: [yit-backend-service] needs_services: ['service://foo/bar'] """ data = yaml.load(data_text, Loader=yaml.Loader) @@ -245,4 +245,4 @@ def test_set_attrs_with_obsolete_yaml_services_format(self): host.set_attrs_from_data(data) self.assertEqual(len(host.services), 1) self.assertTrue("backend-service" in host.services) - self.assertEqual(host.services["backend-service"]["service_artefact"], "yit-backend-service") + self.assertEqual(host.services["backend-service"]["service_artefact"], ["yit-backend-service"])