diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-08 08:00:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-08 08:00:36 +0000 |
| commit | a69d6de9e915730ea404ecc2a37d227088c31471 (patch) | |
| tree | ead3e5153d22f9eb0ac677e9502f20e62de65aeb | |
| parent | 4c7a122a6ff45a319162d084e194a414f072576c (diff) | |
| parent | 59cf95974b2b9c0271c1ff9c9604b960c4bcfa26 (diff) | |
Merge "Fix dict conversion in tempest.conf"
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 | ||||
| -rw-r--r-- | 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 d3f7a7b1f..ea206cd4d 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -264,7 +264,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 c456c3997..316f21be2 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -162,9 +162,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("") |