From 5e65114e9e8244a558279595422dcc7b07f9b862 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 8 Sep 2018 09:36:28 +0200 Subject: Fix dict conversion in tempest.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/openstack/oslo.config/blob/master/oslo_config/types.py#L600 https://build.opnfv.org/ci/view/fuel/job/functest-fuel-virtual-daily-master/817/consoleFull Change-Id: Icde9938bb9f6c0c37d2504317f31b0af4ef9ee8e Signed-off-by: Cédric Ollivier (cherry picked from commit 59cf95974b2b9c0271c1ff9c9604b960c4bcfa26) --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 +- functest/tests/unit/openstack/tempest/test_conf_utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 7034792d2..f9914ceb1 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -269,7 +269,7 @@ def configure_verifier(deployment_dir): def convert_dict_to_ini(value): "Convert dict to oslo.conf input" assert isinstance(value, dict) - return ",".join("{}={}".format( + return ",".join("{}:{}".format( key, val) for (key, val) in six.iteritems(value)) diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py index 7c493372f..3f4af3d9e 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -186,9 +186,9 @@ class OSTempestConfUtilsTesting(unittest.TestCase): self.assertEqual( conf_utils.convert_dict_to_ini({}), "") self.assertEqual( - conf_utils.convert_dict_to_ini({"a": "b"}), "a=b") + conf_utils.convert_dict_to_ini({"a": "b"}), "a:b") value = conf_utils.convert_dict_to_ini({"a": "b", "c": "d"}) - self.assertTrue(value == "a=b,c=d" or value == "c=d,a=b") + self.assertTrue(value == "a:b,c:d" or value == "c:d,a:b") with self.assertRaises(AssertionError): conf_utils.convert_list_to_ini("") -- cgit 1.2.3-korg